changelog
Bootstrap 3.3.1 + bower component updated
Merge branch 'master' into history

Conflicts:
	public/css/public.css
	public/js/admin/components.min.js
css + js minified