pom merge
Adding CUSTOMERREVIEWER role along with User. Work In Progress

(Couple of tests in UserServiceTest are commented for the moment because of Hibernate Lazy Load exceptions at runtime)
Also added TempUserDaoHibernateImplTest (JUnit TestCase) Need to be ported to corresponding groovy test case.

Conflicts:
	eHour-common/src/main/java/net/rrm/ehour/domain/User.java
	eHour-common/src/main/java/net/rrm/ehour/domain/UserRole.java
	eHour-service/src/main/java/net/rrm/ehour/user/service/UserServiceImpl.java
	eHour-service/src/test/java/net/rrm/ehour/user/service/UserServiceTest.java
uncommented the reviewer association logic

Conflicts:
	eHour-service/src/main/java/net/rrm/ehour/user/service/UserServiceImpl.java
	eHour-service/src/test/java/net/rrm/ehour/user/service/UserServiceTest.java
uncommented the reviewer association logic

Conflicts:
	eHour-service/src/main/java/net/rrm/ehour/user/service/UserServiceImpl.java
	eHour-service/src/test/java/net/rrm/ehour/user/service/UserServiceTest.java
DerbyDataSourceFactory was still picking up ehour.db.version from the derby hibernate file. Fixed, now uses ehour.properties

Conflicts:
	eHour-common/src/main/java/net/rrm/ehour/appconfig/ConfigUtil.java
	eHour-persistence-derby/src/main/java/net/rrm/ehour/persistence/datasource/DerbyDataSourceFactory.java
	eHour-standalone/src/main/java/net/rrm/ehour/EhourServer.java
	eHour-standalone/src/main/java/net/rrm/ehour/EhourServerRunner.java
	eHour-wicketweb/src/main/java/listener/EnvInitListener.java
Renamed ConfigUtil to EhourHomeUtil

Conflicts:
	eHour-common/src/test/groovy/net/rrm/ehour/appconfig/EhourHomeUtilTest.groovy
	eHour-persistence-derby/src/main/java/net/rrm/ehour/persistence/datasource/DerbyDataSourceFactory.java
	eHour-persistence/src/main/java/net/rrm/ehour/persistence/appconfig/HibernateConfiguration.java
	eHour-service/src/main/java/net/rrm/ehour/config/TranslationDiscovery.java
	eHour-service/src/main/java/net/rrm/ehour/config/service/ConfigurationServiceImpl.java
	eHour-standalone/src/main/java/net/rrm/ehour/EhourServerRunner.java
	eHour-wicketweb/src/main/java/listener/EnvInitListener.java
	eHour-wicketweb/src/main/java/net/rrm/ehour/ui/EhourWebApplication.java
EHO-221

Conflicts:
	eHour-wicketweb/src/main/java/net/rrm/ehour/ui/admin/assignment/panel/form/AssignmentFormComponentContainerPanel.java
	eHour-wicketweb/src/main/java/net/rrm/ehour/ui/admin/assignment/panel/form/AssignmentTypeFormPartPanel.java
EHO-221

Conflicts:
	eHour-wicketweb/src/main/java/net/rrm/ehour/ui/admin/assignment/panel/form/AssignmentFormComponentContainerPanel.java
	eHour-wicketweb/src/main/java/net/rrm/ehour/ui/admin/assignment/panel/form/AssignmentTypeFormPartPanel.java
First cut of Customer and Reviewer association is working
EHV-7: Introducing Activity Entity
Addition of first cut for Activity class, related Dao and Service skeletons.

Conflicts:
	eHour-common/src/main/java/net/rrm/ehour/domain/DomainObjects.java
	eHour-persistence-derby/src/main/resources/ddl/ddl-ehour-1.0.xml
added queries on activities to retrieve by user and project; added tests and DAO Methods

Conflicts:
	eHour-persistence/src/main/resources/hibernate-ehcache.xml
Upgraded ehour.db.version in all eHour.properties file to 1.1 (because of addition of new table activities)

Conflicts:
	assembly/standalone/conf/ehour.properties
	assembly/war/conf/ehour.properties
	eHour-common/src/test/resources/conf/ehour.properties
	eHour-standalone/src/test/resources/home/conf/ehour.properties
Added code for Activity Service
Corrected the problem with USer Role (CUSTOMERREVIEWER) while displaying User Information in certain scenarios

Conflicts:
	eHour-common/src/main/java/net/rrm/ehour/domain/UserRole.java
	eHour-service/src/main/java/net/rrm/ehour/user/service/UserServiceImpl.java
	eHour-service/src/test/java/net/rrm/ehour/user/service/UserServiceTest.java
	eHour-wicketweb/src/dist/i18n/EhourWebApplication.properties
	eHour-wicketweb/src/main/java/net/rrm/ehour/ui/common/util/CommonWebUtil.java
	eHour-wicketweb/src/test/java/net/rrm/ehour/ui/common/util/WebUtilsTest.java
Added Basic Page for Activity Admin and form panel links and tests

Conflicts:
	eHour-wicketweb/src/dist/i18n/EhourWebApplication.properties
	eHour-wicketweb/src/main/java/net/rrm/ehour/ui/EhourWebApplication.java
	eHour-wicketweb/src/main/java/net/rrm/ehour/ui/common/component/header/HeaderPanel.java
	eHour-wicketweb/src/main/java/net/rrm/ehour/ui/common/panel/nav/admin/AdminNavPanel.html
	eHour-wicketweb/src/main/java/net/rrm/ehour/ui/common/panel/nav/admin/AdminNavPanel.java
EHV-23: Basic Management UI for Adding an Activity
EHV-22: Management UI for adding/editing an Activity
EHV-22: Modified property file to take into account newly added keys for Activities. Have appended (TO-DO) after each value for all the newly added keys for ease of changing at a later stage

Conflicts:
	eHour-service/src/test/resources/i18n/EhourWebApplication.properties
	eHour-service/src/test/resources/i18n/EhourWebApplication_de.properties
	eHour-service/src/test/resources/i18n/EhourWebApplication_el.properties
	eHour-service/src/test/resources/i18n/EhourWebApplication_es.properties
	eHour-service/src/test/resources/i18n/EhourWebApplication_fr.properties
	eHour-service/src/test/resources/i18n/EhourWebApplication_it.properties
	eHour-service/src/test/resources/i18n/EhourWebApplication_ja.properties
	eHour-service/src/test/resources/i18n/EhourWebApplication_nl.properties
	eHour-service/src/test/resources/i18n/EhourWebApplication_pl.properties
	eHour-service/src/test/resources/i18n/EhourWebApplication_pt.properties
	eHour-service/src/test/resources/i18n/EhourWebApplication_sv.properties
	eHour-wicketweb/src/dist/i18n/EhourWebApplication_de.properties
	eHour-wicketweb/src/dist/i18n/EhourWebApplication_el.properties
	eHour-wicketweb/src/dist/i18n/EhourWebApplication_es.properties
	eHour-wicketweb/src/dist/i18n/EhourWebApplication_fi.properties
	eHour-wicketweb/src/dist/i18n/EhourWebApplication_fr.properties
	eHour-wicketweb/src/dist/i18n/EhourWebApplication_it.properties
	eHour-wicketweb/src/dist/i18n/EhourWebApplication_ja.properties
	eHour-wicketweb/src/dist/i18n/EhourWebApplication_nl.properties
	eHour-wicketweb/src/dist/i18n/EhourWebApplication_pl.properties
	eHour-wicketweb/src/dist/i18n/EhourWebApplication_pt.properties
	eHour-wicketweb/src/dist/i18n/EhourWebApplication_sv.properties
	eHour-wicketweb/src/dist/i18n/EhourWebApplication_zh.properties
EHV-2: Implemented implicit addition of Customer Reviewer role for a User while creating Customer

Conflicts:
	eHour-common/src/main/java/net/rrm/ehour/domain/UserRole.java
	eHour-persistence/src/test/java/net/rrm/ehour/persistence/customer/dao/TempCustomerDaoHibernateImplTest.java
	eHour-service/src/main/java/net/rrm/ehour/customer/service/CustomerServiceImpl.java
	eHour-service/src/main/java/net/rrm/ehour/user/service/UserService.java
	eHour-service/src/main/java/net/rrm/ehour/user/service/UserServiceImpl.java
	eHour-service/src/test/java/net/rrm/ehour/customer/service/CustomerServiceTest.java
	eHour-service/src/test/java/net/rrm/ehour/user/service/UserServiceTest.java
EHV-2