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

Conflicts:
	src/com/mobilenpsite/android/common/db/dal/QuestionsServices.java
	src/com/mobilenpsite/android/ui/activity/common/YHJLListActivity.java
Merge branch 'master' of github.com:Alife/Android