Updated to FoBo 1.2 with bootstrap v2.3.2 and font awesome v3.2.1
Merge branch 'master' of
git@github.com:karma4u101/Templating-With-Twitter-Bootstrap.git

Conflicts:
	build.sbt