dropdown added
Use gulp
Merge branch 'master' into let-700

Conflicts:
	package.json
Fix merge issues