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

Conflicts:
	src/com/mobilenpsite/android/ui/adapter/AdapterModel.java
Merge branch 'master' of github.com:Alife/Android