去除designer-android
Merge branch 'dev_liqian' of https://github.com/liqian008/designer.git into dev_liqian

Conflicts:
	designer-android/project.properties
	designer-android/src/com/bruce/designer/activity/Activity_AlbumInfo.java
	designer-android/src/com/bruce/designer/activity/Activity_Main.java