Revert "first button :D"

This reverts commit 102d1dd220a210bd9283fa66f47c6bf971730e1f.
Merge branch 'master' of https://github.com/edi-design/sm-drinking-system

Conflicts:
	frontend/android/sm-drinking-system/src/main/java/com/sm/drinking/DrinkingActivity.java
	frontend/android/sm-drinking-system/src/main/res/layout/activity_drinking.xml
	frontend/android/sm-drinking-system/src/main/res/values/ids.xml
- rebuild config
Merge remote-tracking branch 'origin/master'