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

Conflicts:
	barter.li/res/values/strings.xml
Merge branch 'development' of https://github.com/barterli/barterli_android into development

Conflicts:
	barter.li/res/layout/fragment_reset_password.xml
	barter.li/src/li/barter/fragments/LoginFragment.java
	barter.li/src/li/barter/fragments/PasswordResetFragment.java
	barter.li/src/li/barter/utils/AppConstants.java
Merge branch 'development' of https://github.com/barterli/barterli_android into development