Updated Screen Classes (4/16/14, 20:31)

Newer screen classes. High priority issue is resolving Android-Sofia
integration conflicts.
Merge branch 'master' of https://github.com/dukeForsyth/Final_ProjectV1