Migration to Bootstrap 3.0
Merge ../x0y0

Conflicts:
	Gemfile.lock