Sprint task - removing not used files and adding .keep files to keep folder structure
Sprint task - p1 fix for http://eclip.se/449874 - part 1
Sprint task - p1 fix for http://eclip.se/449874 - part 2