initial add of bootstrap3 branch

Still in development
update the readme to include the correct travis badge
fix navigation
update cms version
Merge branch 'bootstrap3'

Conflicts:
	composer.lock
Revert README.md file