Callback
Merge branch 'master' of https://github.com/sstmartin/flight-instructor-mobile

Conflicts:
	js/database.js