asd
asd
Merge branch 'master' of https://github.com/lombareload/death-ray2.git

Conflicts:
	death-ray-portlet/docroot/WEB-INF/src/com/deathRay/portlet/DeathRay.java
	death-ray-portlet/docroot/html/deathray/view.jsp