LMW-16 Changes for Beta3
LMW-16 Fixed rebase error
Merge LMW-16 Adapt source code to XCode 6 Beta 3