Update less
Add paper theme
Add yeti theme
Modify Grunt to build themes
Support for themes
Update user settings
Update handling of themes
Merge branch 'themes'

* themes:
  Update handling of themes
  Support for themes
  Modify Grunt to build themes
  Add yeti theme
  Add paper theme
Update navbar height
Separate out resize-panel directive
Update rules to use new resize directive
Merge branch 'master' into cordova

* master:
  Update rules to use new resize directive
  Separate out resize-panel directive
  Update navbar height
  Update handling of themes
  Update user settings
  Support for themes
  Modify Grunt to build themes
  Add yeti theme
  Add paper theme
  Update less

Conflicts:
	Gruntfile.js
	build/src/app/models/userModel.js
	build/templates-app.js
	src/app/automation/rule.tpl.html
	src/app/models/userModel.js
Fix merge conflicts