Final commit before going to unstable
Merge branch 'master' of https://github.com/sociam/indx

Conflicts:
	html/js/vendor/angular-route.min.js