#62 Refactored popup code into a separate service.
Merge remote-tracking branch 'origin/master'

Conflicts:
	scenarioo-client/app/views/navigation.html