DB refactor
Merge branch 'master' of https://github.com/johnlife/Glimpse-Android.git

Conflicts:
	src/odesk/johnlife/glimpse/data/db/DatabaseHelper.java