Merge remote-tracking branch 'origin/master'

Conflicts:
	android/.idea/misc.xml
	android/HackcessAngel/src/main/java/com/hackcess/angel/DetailActivity.java
	android/HackcessAngel/src/main/java/com/hackcess/angel/MainActivity.java
Merge remote-tracking branch 'origin/master'