Force Integer as Generic ID for all entities
Modifications to enable static weaving
Merge branch 'master' into pk2Integer

Conflicts:
	dao/src/main/java/net/sf/gazpachosurvey/repository/support/LocalizedRepositoryImpl.java
Small changes
Persistence file renamed to avoid conflicts with spring