Alot of shit.... gonna fix all the models in next commit
Merge branch 'master' of github.com:Hyperactivity/android-app-server

Conflicts:
	src/assistant/Constants.java
	src/core/ForumRequestHandler.java