jscs more
Merge branch 'dev_main' of https://github.com/emailsucks/flybox_server into koa_dev_branch
update box controller
Merge branch 'dev_main' of https://github.com/emailsucks/flybox_server into dev_box

Conflicts:
	build/CSS/box.css
	build/CSS/box.css.map
working on box gets
Merge branch 'dev_box' of https://github.com/emailsucks/flybox_server into koa_dev_branch
cleaned and functional angular box get route
Merge pull request #48 from emailsucks/koa_dev_branch

Koa dev branch
get even with dev main