include inspinia
Merge branch 'origin/arjay.firefly.stage'

Conflicts:
	WEB-INF/classes/application.properties