Added the file extension .jpeg to the file filter of the plupload plugin
	modified:   src/main/webapp/lib/pykl-angular-ui/pykl-angular-ui.js
Added a message to inform users of file size and format restrictions when uploading profile images
	modified:   src/main/webapp/css/app.css
	modified:   src/main/webapp/js/directives.js
	modified:   src/main/webapp/lib/profile/partials/view.html
Cms images now always have proper width and height dimensions
	modified:   src/main/webapp/css/app.css
	modified:   src/main/webapp/js/directives.js
	modified:   src/main/webapp/lib/profile/partials/view.html
	modified:   src/main/webapp/lib/pykl-angular-ui/pykl-angular-ui.js
	modified:   src/main/webapp/lib/pykladmin/partials/articlescreate.html
Merge remote-tracking branch 'origin/develop' into develop

* origin/develop:
  Removed not working attempt to force a reseed of the CMS, and also fixed the bug with an admin changing the user profile picture
  Added an api to reload the cms, even if the cms exists