modify popup
Merge branch 'gh-pages' of https://github.com/linsolas/sg-hackathon into gh-pages

Conflicts:
	app/scripts/controllers.js