no message
Merge branch 'master' of https://github.com/rene-dohan/Creative-Software-IOS

Conflicts:
	Core/Categories/NSDictionary+Extension.h
	Core/Categories/NSMutableArray+Extension.h
	Core/Categories/NSMutableArray+Extension.m