version 1.2.0-SNAPSHOT
compatibility with new NPM tasks for grunt-maven-plugin
Merge branch 'master' into release-1.2.0

Conflicts:
	pom.xml
changed name of properties for grunt to grunt-maven
updated README for 1.2.0
renamed template for grunt maven properties
[maven-release-plugin] prepare release grunt-maven-plugin-1.2.0