Bootstrap3
bootstrap3
bootstrap3
bootstrap3
Bootstrap 3
Merge commit 'fa1f669584a3ee3237b8c497a9453442ebef9807'

Conflicts:
	noPlan-parent/noPlan-webapp/src/main/webapp/application/index.html
	noPlan-parent/noPlan-webapp/src/main/webapp/application/scripts/app.js
	noPlan-parent/noPlan-webapp/src/main/webapp/application/views/menu.html