Merge pull request #59 from mtc2013/static_refactor

Static refactor
just some line spacing
refactoring specs and refactoring update in org controller to use can_edit