Changes to Nasa Registration
Merge branch 'estimator' of https://github.com/cmusv-sc/ArchF2013-Project3-FT into estimator
Changes after conflict in NasaReg Controller file
making changes to httpHelper
change nlogin to login
Few changes to routing
Merge branch 'estimator' of https://github.com/cmusv-sc/ArchF2013-Project3-FT into estimator
Adding gson file
Added menus
Added navigation from registration to login
Changed route of tutorial from estimate to estimator
upload files into server side
Merge branch 'estimator' into upload
upload a file into the server side under tmpfiles/
add tmpfiles and modify gitignore
upload the files into s3
Revert "upload the files into s3"

This reverts commit 0250f11f5c05daa6ce63f027d7af0b9c2dff22e9.
remove the secret key
add edit button for device
add edit button for device, but lacking the function to change the representation