Refactoring

Prettifierng dictionary comprehensions in index
Merge branch 'dev' of https://github.com/sooop/w into dev

Conflicts:
	app/page.py
	app/views.py