db demo
Merge remote-tracking branch 'origin/master'

Conflicts:
	BadUIApp/src/selab/dev/baduiapp/activity/RythmGameActivity.java
merged