added delete image option
merge conflict fix application controller
Merge branch 'master' of github.com:StrataLabs/nb_app