Popup functionality added
Merge branch 'master' of https://github.com/achristoph/gogo

Conflicts:
	app/index.html