Merge branch 'develop' of github.com:caktus/django-timepiece into develop

Conflicts:
	timepiece/views.py
Merge branch 'develop' of github.com:caktus/django-timepiece into develop

Conflicts:
	timepiece/views.py
Fixed double import in views