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

Conflicts:
	res/values/strings.xml
	src/com/mobilenpsite/android/HospitalIntroductionActivity.java
	src/com/mobilenpsite/android/MainOthersActivity.java
Merge branch 'master' of github.com:Alife/Android

Conflicts:
	src/com/mobilenpsite/android/HospitalIntroductionActivity.java