merge changes
Merge branch 'master' of https://github.com/feitelsonc/Amp

Conflicts:
	src/com/amp/ServerAsyncTask.java