ignore xcuserdata
added md5 method to NSString additions
merged changes from master