Added user edit functionality
Merge branch 'master' of https://github.com/purdue-epics-ims/ims2014

Conflicts:
	johnslist/dbtest/views.py