update salt states
add groups app

Conflicts:
	thousand/settings/base.py
	thousand/templates/rapidsms/_nav_bar.html
	thousand/urls.py
add trans tags to templates
update fixtures and settings for timelines changes