Annotations making this class an db entity
Merge branch 'master' of https://github.com/VitoInfinito/codedark

Conflicts:
	src/main/java/core/User.java
Merge branch 'master' of https://github.com/VitoInfinito/codedark