merge
Corrected doctors#update route - Fix #118
Merge pull request #127 from banana-slugs-2014/bugfix

Corrected doctors#update route - Fix #118
Controller refactor --
  DRY up Doctors, Records, and Sessions Controllers using new helper method in Application Controller.
Fix major issue of username not unique, resulting when anyone
logs in, they always log into the first account with said username
Refactor Preferences controller to use helper json renderer.
Merge pull request #130 from banana-slugs-2014/styling

Styling
Merge pull request #132 from banana-slugs-2014/DRYer-controllers

Dr yer controllers
Merge branch 'master' of https://github.com/banana-slugs-2014/GlucoseAmigo into unique_username
Merging master.
Fix login route
Hotfix
Merge pull request #135 from banana-slugs-2014/login-fix

Login fix
Merge pull request #131 from banana-slugs-2014/unique_username

Fix major issue of username not unique, resulting when anyone
Correct routes for record edit - Fix #129
Remove Test data from master
Merge pull request #134 from banana-slugs-2014/bugfix-edit-records

Bugfix edit records
Merge branch 'master' of https://github.com/banana-slugs-2014/GlucoseAmigo

Conflicts:
	app/controllers/graphs_controller.rb
working graph with UTC code
working formatted dates
working graph with customized x axis