Merge branch 'lergo-22-23-24' of https://github.com/lergo/lergo-ui into develop

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/lesson.js
	app/views/baseLayout.html
	app/views/lesson/createlesson.html
	app/views/lesson/mylessons.html