hotfix hashtags prod
Merge branch 'master' of https://github.com/RElabLiege/hashtag-lamp
Merge branch 'master' of https://github.com/RElabLiege/hashtag-lamp
Merge branch 'master' of https://github.com/RElabLiege/hashtag-lamp
added socket.io script to frontend
minor changes
Merge branch 'master' of https://github.com/RElabLiege/hashtag-lamp

Conflicts:
	server/modules/twitter_module.js
Merge branch 'master' of https://github.com/RElabLiege/hashtag-lamp

Conflicts:
	server/modules/twitter_module.js
	server/tcp_server.js
Resolved merge conflicts