Proper layout for request page
Stopped tracking generated properties file
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/properties/ResourceBundle.properties
	war/WEB-INF/classes/properties/ResourceBundle.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/properties/ResourceBundle.properties
	war/WEB-INF/classes/properties/ResourceBundle.properties