Merge branch 'develop'
# raise version to 1.3 and generate docu + dist
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	package.json
#4 also pass event to promise and callback
#4 raised version
Merge branch 'master' into develop