Reconfigure seed photo routes
Merge pull request #11 from davegw/views

Add recent photos to status page and refactor reply and confirm routes
Add temp storage for images
Merge branch 'master' of https://github.com/Face-Off/faceoff
Update seed images to correct number.
Add s3 storage of photos
Add s3 upload
Add tempFile delete
Add remote config for s3 credentials
Merge branch 'master' of https://github.com/Face-Off/faceoff
Merge pull request #12 from areagray/master

Add s3 photo handling
Add a pre processing functon for thread create
Merge branch 'master' of https://github.com/Face-Off/faceoff

Conflicts:
	package.json
Set server to allow CORS
Test CORS API call
Merge pull request #13 from TheMadKoder/master

Add a pre processing function for thread create to handle phone number to user._id substitution
Merge branch 'master' of https://github.com/Face-Off/faceoff into views

Conflicts:
	server/routes.js