x
x
x
x
Merge remote-tracking branch 'upstream/master'

Conflicts:
	application/data/api.txt
	js/logFcn.js