rebel.xml
Merge branch 'master' of git@github.com:soluvas/soluvas-web.git

Conflicts:
	bootstrap/src/main/resources/rebel.xml
	login/src/main/resources/rebel.xml
	nav/src/main/resources/rebel.xml
	site/src/main/resources/rebel.xml