add a callback so clients can more define the column family definition during creation time
Merge branch 'master' of github.com:deanhiller/playorm
add ability to configure playorm when used in PlayFramework with the plugin now
fix checkstyle error
Merge remote-tracking branch 'upstream/master'
Merge pull request #104 from snazy/master

Modifications to generated pom.xml
Commenting this test until fixed so that build is passed for other users
add a way to configure playorm in playframework and add timeseries support in typedsession(not the best support and we need to make this better later but it works for now)
Merge branch 'config'

Conflicts:
	src/main/java/com/alvazan/play/NoSqlConfig.java
	src/main/java/com/alvazan/play/NoSqlPlugin.java
Merge branch 'master' of github.com:deanhiller/playorm
fix the checkstyle issue
Fixing issue #106 and removing source compatibility so that it complies to available jdk
Merge remote-tracking branch 'upstream/master'