Dev See merge request romanov73/ng-tracker!27
Dev to master See merge request romanov73/ng-tracker!25