Merge branch 'master' into bbalentine
Merge branch 'master' into bbalentine
pushing data slaving back upstream
added fixes for default param bug in data slaving
updated properties with variable placeholder
minor changes
fixed bug where if usertoken wasn't defined display would break
Merge pull request #23 from brianadamsdesigns/bbalentine

addressed comments and tested locally
Merge branch 'master' into BestBuyImplementation

Conflicts:
	controllers/controllersSubmission.js
	models/properties/properties.js
	submission.html