changes
Merge branch 'master' into abhi

Conflicts:
	poke-netty/src/META-INF/persistence.xml
	poke-netty/src/poke/resources/RegisterResource.java
	poke-netty/src/poke/server/storage/jpa/UserOperation.java
Basic python code