Updated bootstrap to v3.0.3
Merge branch 'master' into grunt

Conflicts:
	public/assets/javascripts/bootstrap.min.js
	public/assets/sass/base/_bootstrap-theme.scss
	public/assets/sass/base/_bootstrap.scss
	public/assets/stylesheets/style.css
Removed plassets
Recompiled style.css