Functional tabs
merging
handling active category
Merge branch 'master' into ui
categories navigation
Categories-nav
login page
Merge branch 'ui' of github.com:mru2/demo_chrono into ui

Conflicts:
	app/preview.html
login page
working on tabs