controllers returning static content added with url mapping
Merge branch 'master' of github.com:Gitification/gitification

Conflicts:
	server