Merge branch 'develop' into develop_android
Add orderby to Fasade
Fixed some bugs with screens
Merge branch 'develop_android' into develop