Merge branch 'master' into develop
add tslint in build and conform code to defined rules
Merge branch 'master' into develop

Conflicts:
	src/main/mode.ts
bump grunt-template-jasmine-istanbul version
replace es6-promise by bluebird
Merge branch 'develop'