reworked some code on create and update
Merge branch 'master' of https://github.com/Openovate/evejs