Pushing old changes
Merge http://github.com/SoftwareDefinedBuildings/rapidportal

Conflicts:
	rapidportal/broker.py
	rapidportal/views.py