UI changes for investigation
Merge branch 'development' of github.com:joshsoftware/kimayaTPN into development

Conflicts:
	app/assets/stylesheets/application.scss
	app/assets/stylesheets/bootstrap.css
	app/controllers/application_controller.rb
	db/schema.rb