reorganizing js files
Merge branch 'master' of github.com:creativeslice/goldenegg

Conflicts:
	library/gulpfile.js