added forgot password
Merge branch 'development' of https://github.com/barterli/barterli_android into development

Conflicts:
	barter.li/res/values/strings.xml
cleared navigation issues while resetting password