Merge branch 'master' into hashmap

Conflicts:
	Gruntfile.js
Merge branch 'hashmap'