api docs, change-password method
Merge remote-tracking branch 'origin/front-end-mockup-dev' into api-methods

Conflicts:
	README.md
notifications
Merge branch 'api-methods' into front-end-mockup-dev