Upgrade to Bootstrap3
Cleanup JS with RequireJS. jQuery conflict with Django toolbar to be resolved
fix mobile display
Merge remote-tracking branch 'origin/master' into bs3

Conflicts:
	game/templates/user/login.html
	static/assets/js/add_result.js
Use slacker version in requirements
Merge remote-tracking branch 'origin/master' into bs3

Conflicts:
	bower.json
	game/templates/game/add.html
	game/templates/game/index.html
	game/templates/game/team.html
	game/templates/user/login.html
	static/assets/js/score_chart.js
	static/assets/less/rankme.less
	templates/base.html
Move the newer version of score_chart as a require module
Merge remote-tracking branch 'origin/master' into rest

Conflicts:
	requirements/base.txt