major refactoring, restructure functionality

* merge reset and cancel button functionality into discard button
* view enhancements
* simplifying javascript code
Merge branch '23-codemirror_integration' of github.com:ontohub/ontohub into 23-codemirror_integration

Conflicts:
	app/assets/javascripts/codemirror-custom.js