Themes
Themes
Merge branch 'master' of https://github.com/heshamsafi/kryptoncms.git

Conflicts:
	kryptoncms/src/main/webapp/resources/js/Main.js