Merge branch 'development' into socialshare
Merge branch 'development' into socialshare
Merge branch 'development' into socialshare
Merge branch 'development' into socialshare
Merge branch 'development' into socialshare
[article] - Metatags for TT and FB
[fixtures] Typo
[proposal-article] - Use config host and port
[proposal-article] - Use config host and port
[fixtures] - Fix typos
Merge branch 'development' into socialshare

Conflicts:
	lib/proposal-article/article.jade
	lib/proposal-article/proposal-article.js
[article] social sharing metatags
Merge branch 'development' into socialshare

Conflicts:
	lib/proposal-article/article.jade
Merge branch 'development' into socialshare
[twitter-card] - Create twitter card middleware
Merge branch 'development' into socialshare

Conflicts:
	lib/proposal-article/article.jade
	lib/proposal-article/proposal-article.js
Merge branch 'development' into socialshare

Conflicts:
	lib/proposal-article/article.jade
	lib/proposal-article/proposal-article.js
Merge branch 'development' into socialshare
[socialshare] - Implement twitter card and facebook card
[facebook-card] - Fix url with path.join