Merge branch 'master' of github.com:gweodoo/mpp_project

Conflicts:
Mpp_Project/src/dk/aau/mpp_project/activity/LogInActivity.java
Mpp_Project/src/dk/aau/mpp_project/application/MyApplication.java