Fixing bugs, updating views
Merge branch 'master' of git://github.com/vespakoen/bolt-core

Conflicts:
	src/Bolt/Core/App.php