fuck
Merge branch 'mikael' of https://github.com/miko91/myLearn into mikael

Conflicts:
	www/Applications/Admin/config/app.xml
	www/Applications/Frontend/Config/app.xml
	www/Applications/Prof/Config/app.xml