Cleaning up license documentation
Fixing ordering of licenses
Merge branch 'master' into neon-1238-gridster

Conflicts:
	bower.json
	licenses/README.txt