finalise short image urls implementation
don't allow orders for IP on Mxit
fix typo
assert that suggest() don't return duplicate keys
add missing import
Merge branch 'mxit-missing-images'
prepare for release
Merge branch 'master' of github.com:Siyavula/emas.mobiletheme

Conflicts:
	docs/HISTORY.txt
add password action
Merge branch 'mxit-missing-images'
prepare for release
Merge branch 'master' into mobile-quick-fixes

Conflicts:
	docs/HISTORY.txt
	emas/mobiletheme/profiles/default/actions.xml
	emas/mobiletheme/views.py