Merge origin/master into Phase-II-Sales-Implementation

Conflicts:
	faces-navigation.NavData
	src/main/resources/META-INF/persistence.xml