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

Conflicts:
	www/Library/Entities/section.class.php