Working on 3Tier - Seizure and Seizure Detail
Merge remote-tracking branch 'origin/dev' into dev