fix db recursion bug when calling Scene(db, context, cursor)
comitting before merge to pickup scene fix
Merge branch 'master' of https://github.com/guardianproject/storymaker
intermediate commit (will delee debug statements after further testing)
migration sucessful, comitting before cleanup
cleaned up migration code w/ additional null pointer check added to server manager
Merge branch 'master' into secureshare

Conflicts:
	app/src/info/guardianproject/mrapp/model/Project.java