add action edit/new
Merge branch 'master' of https://github.com/marius-grad/hacktonro2014