Client can now communicate with server. deserialize does not work
Merge branch 'master' into server-link

# By Lucas Wiener (3) and others
# Via OMMatte (2) and Marcus Nordström (1)
* master:
  Added libs
  Fixed recalculate crash
  Fixed list recalculate crash problem.
  Fixed keyboard issue.
  Fixed keyboard issue.
  Fixed missing text bug
  MainActivity now adds all categories instead of thread doing it

Conflicts:
	src/com/hyperactivity/android_app/activities/MainActivity.java
Added new models and upgraded deserialize
Categories are now fetched from server. Fleshed out Forum class a bit
Merge branch 'master' into server-link

# By Erik Odenman (3) and Marcus Nordström (1)
# Via Erik Odenman (2) and Marcus Nordström (2)
* master:
  Removed targetAPI tag
  Made the thread list on the main page update on resume
  Some design stuff.
  Changed the main navigation from activities to fragments

Conflicts:
	src/com/hyperactivity/android_app/activities/MainActivity.java
Merge branch 'master' into server-link

* master:
  Fixed navigation menu being pushed out of the frame
Merge branch 'master' into server-link

* master:
  Fixed navigation menu being pushed out of the frame
Fixed server loading bug
Merge branch 'server-link' of github.com:Hyperactivity/android-app into server-link

* 'server-link' of github.com:Hyperactivity/android-app:
Merge branch 'server-link'

* server-link:
  Fixed server loading bug
  Categories are now fetched from server. Fleshed out Forum class a bit
  Added new models and upgraded deserialize
  Client can now communicate with server. deserialize does not work