change routes as member
Fix TODO partial name + merge pull commit
Merge branch 'develop' of https://github.com/vinsol/freeka into develop

Conflicts:
	config/routes.rb