Task3 resolution
Adding bower components
Changes in web.xml
Initial web controller
Merge branch 'task4'

Conflicts:
	core-training/src/pl/sebitg/training/core/Main.java