worked on the usermodel but still have problems with creating the user from the jsonobject. i guess gson.fromjson() somehow doesn't work for the user.
Merge pull request #83 from exside/master

Big Update, Homescreen variations, Menu icons, List sorting, crash catching, rotation fixing, state preserving usw
Merge remote-tracking branch 'original/master'

Conflicts:
	ProjectFiles/app/mensaunibe/.classpath
	ProjectFiles/app/mensaunibe/res/values-de/mub__strings.xml
	ProjectFiles/app/mensaunibe/res/values/mub__strings.xml
	ProjectFiles/app/mensaunibe/src/com/mensaunibe/app/model/DataHandler.java
	ProjectFiles/app/mensaunibe/src/com/mensaunibe/app/views/FragmentMenuListDayFull.java
	ProjectFiles/app/mensaunibe/src/com/mensaunibe/util/database/tables/FriendTable.java
	ProjectFiles/app/mensaunibe/src/com/mensaunibe/util/database/tables/NotificationTable.java
	ProjectFiles/app/mensaunibe/src/com/mensaunibe/util/database/tables/UserTable.java
	ProjectFiles/app/mensaunibe/src/com/mensaunibe/util/tasks/TaskCreateModel.java
	ProjectFiles/app/mensaunibe/src/com/mensaunibe/util/tasks/TaskUpdateDB.java
current version
fixed ant build files for jenkins
fixed weirdly broken project.properties
Merge remote-tracking branch 'original/master'
Merge pull request #84 from NicolasKessler/master

No changes in the code, just fixed ant build files for jenkins
some new test cases and rewrite of code that went lost in one of the last pull requests
did some clean up, added setStatus(text) method in the controller to show a status message in the right top corner, and removeStatus() to remove it
implemented database tests. once case failing(don't know if i found a bug or the test is wrong, will seet to this later
Merge pull request #86 from NicolasKessler/master

More Tests implemented
clean-up done, removed loop from web service
Merge remote-tracking branch 'original/master'

Conflicts:
	ProjectFiles/tests/project.properties
-
na
cleanup done
Merge pull request #87 from theodortruffer/master

cleanup done
Merge cleanup and make app work in emulator