Upgrade from Bootstrap 2 to Bootstrap 3
Merge branch 'bootstrapMigration' of https://github.com/TomSteinbrecher/codecombat into feature/bootstrap3

Conflicts:
	app/templates/play/level/playback.jade
Merge branch 'master' into feature/bootstrap3
Fixed the progress bar for loading pages.
Fixed the new model modal in search.
Fixed profile page.
Fixed account settings page.
Fixed the top nav height.
Fixed #278
Fixed #283
More fixes for #283
Removed some more .controls from forms.
Fixed the wizard sprite on the home page again.
Removed a buggy transition.
Fixed #281
Tweaked the home page button. #279
Merge branch 'master' into feature/bootstrap3
Merge branch 'master' into feature/bootstrap3
Merge branch 'master' into feature/bootstrap3

Conflicts:
	app/styles/editor/level/edit.sass

Also experimenting with a new layout for the level editor.
Merge branch 'master' into feature/bootstrap3

Conflicts:
	app/styles/editor/level/edit.sass

Also experimenting with a new layout for the level editor.