WIP
Merge remote-tracking branch 'origin/master'

Conflicts:
	docroot/WEB-INF/src/es/victormiranda/liferay/powerconsole/portlet/PowerConsolePortlet.java
	docroot/WEB-INF/src/service.properties
	docroot/css/main.css
	docroot/js/main.js
	docroot/pages/database.jsp
	docroot/pages/scripting.jsp
Style improvements