Increase timeout as short term solution for upload
Upgrade to final release version of bootstrap 3.

change col-lg to col-md for layout to improve layout of medium screens
fix up collapse javascript/css
Merge branch 'master' of https://github.com/perkinss/Solvn

Conflicts:
	app/views/static_pages/landing.html.erb