Made Data Controller a Singleton, added Time View
Fixed conflicts
Merge pull request #5 from glesage/dev

Made Data Controller a Singleton, added Time View