update model
Merge branch 'develop' of https://github.com/AndrewPong/vCampusLive2013 into develop