Merge branch 'develop'
Now pointing to the master branch of QME in the master branch of the webapp
Merge branch 'develop'

Conflicts:
	Gemfile.lock
Bumping to the latest QME master
Merge branch 'develop'
Bumping the pointer to QME
Merge branch 'develop'

Conflicts:
	Gemfile.lock
Switching to a concrete version of QME on master
Merge branch 'develop'

Conflicts:
	Gemfile
	Gemfile.lock
initial test conversion
initial test conversion
initial conversion to rails 3.1.0
fixed issues with initial tests
fixed some more tests and cover_me
updated user admin and tests
converted specs to testunit tests
add scaffolding for patient dashboard
header and container for patient dash
switch patients to use records collection instead of patient_cache, and access via mongoid
add results and vitals to patient dash