Merge branch 'master' of https://github.com/onkelangil/PvC-app.git

Conflicts:
	daniel/app/src/main/java/com/graungaard/pvc_app/MainActivity.java

Signed-off-by: unknown <salban_k@hotmail.com>
Merge branch 'master' of https://github.com/onkelangil/PvC-app.git