added a new categories view
Merge branch 'buttons'

Conflicts:
	andrew/app/views.pyc