Connection to database
Merge branch 'master' of https://github.com/johnlife/Glimpse-Android.git

Conflicts:
	src/odesk/johnlife/glimpse/activity/PhotoActivity.java