Merge branch 'master' of https://github.com/martinlinggi/forgeddit into develop

Conflicts:
	README.md
Merge branch 'master' into develop
More Details given
CSS fixes, User-List table
work on css - user formula fixed
CSS fixes, User-List table