Updating to bootstrap 3.1.0
Merge branch 'dev'

Conflicts:
	index.php