Revert iframe functionality. Move map directly to ng-view. Add marker and pop-up functionality.
Merge branch 'master' of https://github.com/mmateja/io-smieci