update for new vagrant and vbox
make controllers work for json data
add json views
initial version of mega adder
resolve conflict