Merge origin/master

Conflicts:
	src/main/webapp/resources/css/bootstrap.css
Merge origin/master
Merge origin/master

Conflicts:
	src/main/webapp/resources/css/bootstrap.css
Merge origin/master

Conflicts:
	src/main/webapp/resources/css/bootstrap.css
Merge origin/master