commit post video
Merge remote-tracking branch 'origin/master'

Conflicts:
	HSA/src/com/hsa/MainActivity.java