update
Merge branch 'master' of https://github.com/airshiplay/android

Conflicts:
	android-framework/src/com/airshiplay/framework/util/MobileResource.java
update
update
Merge branch 'master' of https://github.com/airshiplay/android

Conflicts:
rename