Final changes for WEB-4944 task
Final changes for WEB-5974 task and will include also changes in WEB-4944 task
remove a comment
remove comment
remove comment
remove comment
remove unnecssary rake file
remove unnecssary rake file
applying comments
Merge branch 'WEB-4944AndWeb5974' of https://github.com/EOL/eol
Merge master branch with WEB-4944AndWeb5974