Application Properties
Twitter bootstrap integration into Main layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	application.properties
stuff