merging
Merge remote-tracking branch 'upstream/release-1' into release-1
merging to get submissions view
basic importer working for online_order_id & date_time
adding devise views
rename join tables and models. add Orders controllers, routes and views.
add comments to orders. revert importer
resolving merge conflicts
Added complete field to submissions
Fixed merge conflicts in submission controller
Fixed seed merge conflict
Merge pull request #14 from obeid/release-1

Stylesheets and everything is loaded up now
merged tickets and orders.
merging
merge with talal
Add approve button for submissions
Merge pull request #15 from JParker85/release-1

Stylings
merged conflicts. renamed tables.
Add authentication to user & submission controller
Merge branch 'release-1-importer' into release-1

Conflicts:
	app/models/submission.rb