20140108 for android-practice
Merge branch 'master' of https://github.com/heavensay/mobile

Conflicts:
	android-practice/gen/com/example/android_test/BuildConfig.java
	android-practice/gen/com/example/android_test/R.java
	android-practice/gen/com/example/practice/BuildConfig.java
	android-practice/gen/com/example/practice/R.java
	android-practice/src/com/example/practice/DisplayMessageActivity.java
	android-practice/src/com/example/practice/MainActivity.java
	android-test/gen/com/example/android_test/BuildConfig.java
	android-test/gen/com/example/android_test/R.java