Merging GuildsDev into trunk

git-svn-id: http://androminion.googlecode.com/svn/trunk@801 479f531a-0727-ffee-c1d2-1d776a0eae4d