Created dummy page for request
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/resources/scripts/application/application.js