Merge branch 'master' of https://github.com/lordmilutin/esms into nutic
Tour applies done
Merge branch 'master' of https://github.com/lordmilutin/esms
Merge branch 'nutic'

Conflicts:
	app/routes.php
Merge branch 'nutic'

Conflicts:
	app/routes.php