fix stuff
Merge branch 'kh_info_page' of github.com:davidgbe/LinuxBox into kh_info_page
fix routes
Merge branch 'kh_info_page' of github.com:davidgbe/LinuxBox into kh_info_page

Conflicts:
	app/views/apps/start.html.erb