GUI Changes, integrated new components
Merge branch 'master' of https://github.com/GeoKnow/GeoKnowGeneratorUI

Conflicts:
	src/main/webapp/js/controllers.js