Changes
Merge branch 'develop'

Conflicts:
	bootstrap.js
	lib/application.js
Switching around system to be totally event driver.
Whole lots of changed