final frontend
Merge branch 'master' of github.com:2easy/nailmaker