bug fixins
Merge branch 'develop' of https://github.com/PivottVentures/MissionEMR

Conflicts:
	app/__init__.pyc
	app/forms.pyc
	app/models.pyc
	app/views.py
	app/views.pyc