Updated XDK and got new project files. Also deleted shadow images
Merge conflict