update status page
Merge branch 'master' of https://github.com/UX-Mexico/surveyappmaker

Conflicts:
	src/org/urbanlaunchpad/flocktracker/Surveyor.java