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