WIP
Merge remote-tracking branch 'origin/master' into 58619854_align

Conflicts:
	ginco-admin/src/main/webapp/app/controller/ConceptController.js
Implement goto aligned concept feature
[Finishes #58619854]
Merge branch '58619854_align'