fixed merge issues
Merge branch 'development' of github.com:dnajd/ingress-mockup into development
merge fixes