comply with Xcode 6.1 GM update
further refactoring and polishes
added/enchanced tests to support new/existing functionality
xcode proj. settings
Merge remote-tracking branch 'cvasilak/refactoring'