Merge pull request #12 from busho/master

More work done.
Video tags added.
Merge pull request #13 from dmozina/master

Video tag functionality
Merge branch 'master' of https://github.com/ipri2013/portalznanja into busho-merge

Conflicts:
	api/resources.py
	sqlite3.db
	web/fixtures/fixture.json
	web/static/css/main_style.css
	web/static/templates/videoStream.html