fixes
Updated gitignore
merge, resolve #1
merge
Merge branch 'dev' into ht-db

Conflicts:
	controllers/database.js
Merge branch 'ht-db' into dev
elasticSearch start
Merge branch 'dev' of https://github.com/pasqLisena/MediaFragPlayerDemo into suggestMF
elasticSearch integration