Merge branch 'master' of https://bitbucket.org/bkatznel/community-university-portal
Merge branch 'master' of https://github.com/bktz/CUP