Merge pull request #1 from kvaratskhelia/master

Added string rep for location
added lots to paitent:

* nurse_notes
* doctor_notes
* priority (and choices)
Merge branch 'master' of git://github.com/kvaratskhelia/sharklightning-hackathon into kvaratskhelia-master

Conflicts:
	simpler/ermanager/models.py
witch first and last name
Merge pull request #3 from kvaratskhelia/flipfirstandlast

switch first and last name
made rooms integers, also iswaiting
fixed the location string (was critical error)
alot of shit