fixed users routes
added todo to readme
Merges 'development' branch into 'master'.