added reset password rest tests
merged conflicts
Update editPasswd test
Merge branch 'master' of https://github.com/flowgrammable/flowsim
updated controller test to have the correct service name
FIX
Merge branch 'master' of https://github.com/flowgrammable/flowsim
test fix
Update controller.js
fixed rest test reset token file read error
fix test
removed console logs
fixed cont test
slight modifications to some rest test functions
added controller tests for password reset
Adding packet skeleton