20130325 1
20130325 2
Revert "20130325 2"

This reverts commit a9061e43cde1098ccb98d01fa16f524f0eb3a47e.
merge1
Merge branch 'master' of git@github.com:lliiffee/FungDroid.git

Conflicts:
	AndroidManifest.xml