80%
Merge remote-tracking branch 'origin/master'

Conflicts:
	my-addon/data/apex-addon.js
	my-addon/lib/main.js