server configure, register, login with previously used names and logout.
to make a pull
Merge branch 'master' of https://github.com/Jescy/MediaGridAndroid

Conflicts:
	bin/AndroidManifest.xml
	bin/MediaGrid.apk
	bin/R.txt
	bin/classes.dex
	bin/dexedLibs/android-support-v7-appcompat-4a76f2da06ef6355e19a8398a8861fa4.jar
	bin/jarlist.cache
	bin/resources.ap_
	gen/android/support/v7/appcompat/R.java
	gen/com/dismantle/mediagrid/R.java