closes #4 - archive categories + tests
Merge branch 'categories' into develop

Conflicts:
	pyrtos/tests.py