Merge branch 'master' into badams
updating badge controller to reference view in load order object
adding photo submission
updated variables
Merge branch 'master' into badams

Conflicts:
	controllers/controllersBadges.js
updating view variables
Merge branch 'badams'
Merge branch 'master' into badams
adding product catalog info
bug fix
adding selected and disabled state to pagination buttons
Merge pull request #13 from brianadamsdesigns/badams

Badams
updated filter, sort, and pagination to have selected/disabled states
Merge pull request #14 from brianadamsdesigns/badams

updated filter, sort, and pagination to have selected/disabled states
added functionality for tag and media upload display for submission

* only show one open field tag
* show new open field tag when needed
* only show one photo upload
* show new photo upload when needed
* updated photo upload to be more modular
adding feedback status messages

* add status message from json response
* disable buttons while processing
* added controller for close button
* added blank default to sort options
Merge pull request #15 from brianadamsdesigns/badams

added functionality for tag and media upload display for submission
updating getting first hidden child and showing for tags and media uploads
Merge branch 'badams'
Merge branch 'master' into badams