Colorbox
Popup
Merge branch 'master' of https://github.com/daniesg/college_cake

Conflicts:
	js/Selector.js