Preparing for Server
Merge branch 'master' of https://github.com/Portgas-D-Ace/Delegator

Conflicts:
	src/freeuni/android/delegator/app/App.java