Add Bootstrap to Gemfile.
Merge branch 'gmaster' into dev

Conflicts:
	Gemfile.lock