Add 'dosage_time' field to track when to generate reminders, remove notes from UI
Merge branch 'master' of github.com:ProjPossibility/2014-CSUN-CareTaker-1

Conflicts:
	app/database/seeds/MedicationTableSeeder.php
Merge branch 'master' of github.com:ProjPossibility/2014-CSUN-CareTaker-1