Improved shutdown procedure
Merge branch 'develop'

Conflicts:
	bootstrap.js
	lib/application.js