1.0.5

Merge branch 'develop'

1.0.4

Merge branch 'develop'

1.0.3

Merge branch 'develop'

1.0.2: Merge branch 'develop'

# Conflicts:
#	config.js
#	package.json

1.0.1

bumped version to 1.0.1 and added auto release to travis