add main field to package.json
add gulpfile with various tasks for development
Merge commit '2d8b'

Conflicts:
	package.json