temp
Merge branch 'checkin' into check-in
merge in check-in flow
Merge branch 'dev' of https://github.com/Xinchi/CU-App into dev