API, toevoegen subscription + income
Merge branch 'master' of https://github.com/hu-fulp/android-app

Conflicts:
	app/src/main/java/com/fulp/activities/MainActivity.java
	app/src/main/java/com/fulp/fragments/AddIncomeFragment.java