Changed CategoryListPage.scala and categories.html

Tried to delete category
Merge remote-tracking branch 'upstream/master'
edit categories (not working)
[Edit] Tab style an position
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/Nagrand/c3-web
[Edit] Tab style an position
Правка страницы груп
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/org/aphreet/c3/snippet/groups/snippet/GroupListPage.scala
	src/main/webapp/css/c3-next.css
Merge remote-tracking branch 'upstream/master'
[Edit] Categories fix
Merge pull request #57 from Nagrand/master

last changes from juniors