add data pull and json to controller
weekend overhaul of view
Merge branch 'dev'
format code
Merge branch 'dev'