pridany parsr diskusii sme
modifikovany viewer
Merge branch 'master' of github.com:yettiSource/Barometer

Conflicts:
	project/project/views.py
Merge branch 'master' of github.com:yettiSource/Barometer