releasing v0.5.3
updating staging config
fixed reset password bug
removed compiled assets after merging master
Merge remote-tracking branch 'origin/development' into development
Merge branch 'development' of /Users/mark/RubymineProjects/sbcx with conflicts.
committing before moving to prod branch
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	Gemfile
	app/views/service_calls/_job_info.mobile.erb
updated devise version to 2.0.5 to address security issue
env var for email method