added more stuff for the collocation
Merge branch 'master' of https://github.com/macmania/UITeamA

ý5iq:wq:wq:q!
added more stuff