new layout and some style changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/scripts/home/index.phtml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
bootstrap fixes