Merge branch labelAlignmentSettings into mysigma
Merge branch 'master' of https://github.com/qinfchen/sigma-master-bower into mysigma

Conflicts:
	README.md