updates to AMError
Merge branch 'develop' of github.com:mindsnacks/AMFoundation into develop

Conflicts:
	AMFoundation/AMError.h
	AMFoundation/AMError.m