1
Merge branch 'master' of https://github.com/Farcek/JBW-CoreBundle

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/Farcek/JBW-CoreBundle
Merge branch 'master' of https://github.com/Farcek/JBW-CoreBundle
1
Merge branch 'master' of https://github.com/Farcek/JBW-CoreBundle
fix index pages