Unified UI
Cleaned up the diagrams
Archived the old ones in UI Navigation/Old
Merge branch 'master' of https://github.com/CMPUT301W14T07/Team7Project