Merge branch 'master' of https://github.com/romariclaurent/projecttemplate

Conflicts:
	package.json