Working on #30
Working on #30
working on #30
working on #30
working on #30
working on #30
working on #30
Working on #30
Working on #30
Working on #30
Merge branch 'ach_issue30' of https://github.com/gateway4labs/labmanager into ach_issue30

Conflicts:
	labmanager/models.py
	labmanager/rlms/ext/http.py
	labmanager/templates/labmanager_admin/rlms_properties_list.html
	labmanager/views/admin.py
	requirements.txt