Merge remote-tracking branch 'fielddb/master'

Conflicts:
	.gitignore
	.jshintrc
	Gruntfile.js
	README.md
	package.json