Merge remote-tracking branch 'origin/master'

Conflicts:
	droidwolf/src/main/java/com/cevn/droidwolf/MyListFragment.java
	droidwolf/src/main/java/com/cevn/droidwolf/SignupActivity.java
	droidwolf/src/main/res/layout/fragment_list.xml
	droidwolf/src/main/res/values/strings.xml

also character status stuff