minotr
Merge branch 'master' of https://github.com/cromanor/miart-final

Conflicts:
	v2/js/controllers/controller.js