askldf
Merge remote-tracking branch 'origin/master'

Conflicts:
	pingpoint/app/src/main/java/com/pingpoint/pingpoint/FunctionActivity.java