Merge branch 'master' of github.com:Alife/Android

Conflicts:
	src/com/mobilenpsite/android/common/configs/Config.java
Merge branch 'master' of github.com:Alife/Android