Took out a lot of timer code from ServerAsyncTask.
Merge branch 'master' of https://github.com/feitelsonc/Amp

Conflicts:
	bin/classes.dex
	bin/classes/com/amp/MainActivity.class
	bin/resources.ap_