Fixed multiple bugs
Merge branch 'RickBranch' of https://github.com/terracotaPie/JobbaFet into RickBranch

Conflicts:
	www/css/app.css
	www/templates/lists.html