temp checkin
temp checkin
temp checkin
Merge branch 'master' of https://github.com/solution-design/Rss-portlet

Conflicts:
	docroot/js/main.js
removed unecessary files
added .idea to git ignore