情景模式，新增情景模式
Merge remote-tracking branch 'origin/master'

Conflicts:
	android_code/AndroidManifest.xml
	android_code/external/PrivatePhoneDaoGenerator/src/com/photo_me/mobile/android/dao/generator/PMDaoGenerator.java