Merge branch 'master' of https://github.com/Stormram/iDP-app

# By Stormram (5) and Robert (4)
# Via Stormram
* 'master' of https://github.com/Stormram/iDP-app:
  Update calculateClass.java
  Update calculateClassTest.java
  Update calculateClassTest.java
  Update Server.java
  Update Client.java
  no clue ...
  small test class added with JUnit test examples
  ...
  Added new Package with Client inside for app
Merge branch 'master' of https://github.com/Stormram/iDP-app into Mathijs

* 'master' of https://github.com/Stormram/iDP-app: