Select2 bootstrap 3.0.0
Merge branch 'master' of https://github.com/dpgaspar/flask-general

Conflicts:
	app/static/select2/select2.css