Merge pull request #17 from busho/master

Comments and voting functionality.
Update README.md
Merge pull request #18 from busho/master

css style fix
Merge pull request #19 from busho/master

Fully implemented search functionality using TAGs.
Merge pull request #20 from busho/master

User video upload
Merge pull request #22 from busho/master

Added redirect after successful upload
Update README.md
Merge pull request #23 from busho/master

Restored the voting functionality since it got accidentally deleted
Merge pull request #24 from busho/master

User videos + comments finished
Merge pull request #25 from busho/master

Quick fix
Merge pull request #26 from busho/master

Fixes, updates...
User Registration
Merge branch 'master' of https://github.com/ipri2013/portalznanja

Conflicts:
	sqlite3.db
	web/static/css/main_style.css
Merge pull request #27 from dmozina/master

User reg
Merge branch 'master' of https://github.com/ipri2013/portalznanja into busho-merge
Some additional fixes.