share pop up Facebook completed
resolve
Merge commit '11c88aaea3eb4a818f22154a946a5f749e016b89'

Conflicts:
	js/directives/ngEnterDirective.js
	templates/searchTemplate.html