Merge branch 'master' of https://github.com/RSWSMUGirl2016/SMU_Nav