ad jscs
Merge branch 'feature/gulp' into feature/google

Conflicts:
	package.json