Syncing up some changes
Merge branch 'master' of https://github.com/cjf314/mutableconst into cjf314-master

Conflicts:
	ChatClient/chatclient/config.pref
	ChatServer/chatserver/bin/classes.dex
	ChatServer/chatserver/bin/resources.ap_
	ChatServer/chatserver/src/com/mutableconst/android/dashboard_manager/AndroidConnection.java
	ChatServer/chatserver/src/com/mutableconst/chatserver/gui/MainActivity.java
Added /bin and *.pref to gitignore