fix style
Merge github.com:anirama/semio

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

Conflicts:
	project/itclaim/ipsm/views.py
fix context