Merged from master and reverted LiferayDataSource for Liferay 6.0
Fixed a style issue. Proper Vaadin Liferay style is now fetched from the
Vaadin servlet.
Liferay 6.0 changes
Merge branch 'master' into liferay60
Merge branch 'master' into liferay60

Conflicts:
	ds-liferay/lib/portal-service-6.1.1.jar
	ds-liferay/src/main/java/org/vaadin/tori/data/LiferayDataSource.java
Fixing merge errors
added correct portal service jar
Fixed a stupid widget mistake
moved log4j to common
Portlet edit mode might be working now (unsure, can't verify. See http://dev.vaadin.com/ticket/9994)
Fix edit mode to work for Liferay
open in new tab was broken due to a hack
Merge branch 'master' into liferay60
Merge branch 'vaadin-update' into liferay60
Merge branch 'master' into liferay60
First step towards 6.0.6 url parsing
Merge branch 'master' into liferay60

Conflicts:
	ds-liferay/src/main/java/org/vaadin/tori/data/LiferayDataSource.java
Liferay 6.0.* redirection format fixed
Merge branch 'master' into liferay60

Conflicts:
	ds-liferay/src/main/java/org/vaadin/tori/data/LiferayDataSource.java
Merge branch 'master' into liferay60