Filipfix
Merge branch 'master' of https://github.com/sawise/Pub

Conflicts:
	MyApplicationProject/bottomApp/src/main/java/com/group2/bottomapp/APIManager.java
	MyApplicationProject/bottomApp/src/main/java/com/group2/bottomapp/Drink.java
Merge branch 'master' of https://github.com/sawise/Pub