modify bootstrap template
Merge branch 'master' of https://github.com/cherrylabs/arx-core

Conflicts:
	src/views/layouts/bootstrap.tpl.php