Merging
Merge branch 'master' of https://github.com/Asitha/nooba-plugin-imagemediator
removed template plugin