combine front end and back end

still need to re-map some front end stuff
Merge branch 'master' of github.com:AidData/iatigraph
finish merge