Merge pull request #14 from vinkobuble/develop

POPS-175 Fixes with data structure changes and modal dialog
Actually sending the JSON now.
More error checking for testing and added an exception for no token found. I created an erro template that is blank right now and needs to be modified to say something more useful, but it is better that a stack trace
beautify dashboard
Merge branch 'develop' of https://github.com/mjm0therway/pre-order-broadleaf-repositor into develop
add space back
fix the flight number sent to mealSelect
fix flightnumber passing
POPS-191 part 1 - acknowledging multi-flight structure
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop

Conflicts:
	site/src/main/webapp/WEB-INF/templates/pops/dashboard2.html
merge conflict