bootstrap assets added through bower
gemlock file updated
underline problem of active admin removed
jquery is served from bower_components
bower_components added to git
master ignores bower_components
Merge branch 'dev'

Conflicts:
	.gitignore
bower_components removed from master