Added support for NamingStrategies.
Refactored naming strategie configuration into separate method
Fix merge conflicts
Fix build errors
Merge branch 'boukeversteegh-master'