fixed #1
Merge branch 'develop'

Conflicts:
	package.json
	typeahead.css
	typeahead.less