- updated popup styles
Merge branch 'master' of https://github.com/Ometria/retail_week_hackathon_2014

Conflicts:
	docroot/app/less/styles.less