add funct
add funct
new
Merge branch 'alternativeversion' of https://github.com/2shar007/CrowdFeed into alternativeversion

Conflicts:
	client/web/html/index.html
Merge branch 'master' of https://github.com/2shar007/CrowdFeed