My old version re-merged
Merge remote-tracking branch 'origin/master'

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