- angular-ui-router.min.js
Merge branch 'master' of https://github.com/DavidSalzer/mobilesson

Conflicts:
	components/content/content.js
	components/courses/content.php
	components/dashboard/main.php
	components/main/main.html
	components/main/main.php
	index.html