fix style
Merge github.com:anirama/semio

Conflicts:
	project/itclaim/ipsm/views.py
fix code style
Merge github.com:anirama/semio
fix merge bug