Added some columns to AppManagement
Fixed wrong URL in EAVManagement
Take over changes from 'master'