Adam
Merge branch 'master' of https://github.com/miko91/myLearn

Conflicts:
	www/Applications/Frontend/Config/app.xml