20%
added bootstrap
Merge remote-tracking branch 'origin/master'

Conflicts:
	web-view/src/main/java/com/profilactory/webview/controller/Test.java
	web-view/src/main/webapp/WEB-INF/web.xml