Merge branch 'feature/UMMELI-checked-out-task-in-inbox' of github.com:praekelt/ummeli into feature/UMMELI-use-tom-tom-api-for-maps
use message shorthand
use assignment tag instead of simple_tag
Merge pull request #6 from praekelt/feature/UMMELI-checked-out-task-in-inbox

Feature/ummeli checked out task in inbox
Merge branch 'feature/UMMELI-tom-tom-pilot' of github.com:praekelt/ummeli into feature/UMMELI-use-tom-tom-api-for-maps
fix assignment tag
Merge branch 'feature/UMMELI-use-tom-tom-api-for-maps' of github.com:praekelt/ummeli into feature/UMMELI-task-response

Conflicts:
	ummeli/opportunities/views.py
use shorthand for messages