Merge branch 'master' of https://github.com/syzer/angular-qAll

Conflicts:
	LICENSE