Removed active check on mockups for now, if need later we have to rewrite it
Merge branch 'development' of github.com:aakb/odaa_dk into development