Fixes to files
Merge with development
Merge with develop
grunt: fix release build
Merge with development
Merge branch 'development'
FIX wrong merge :rage3:
DB: change test routes to count models
Add styles and main views