2013-06-13: refactorings
Merge branch 'integration'

Conflicts:
	000-branch-master
Merge branch 'integration'
Merge branch 'integration'
Merge remote-tracking branch 'origin/integration'
Merge remote-tracking branch 'origin/integration'
Merge remote-tracking branch 'origin/integration'
disabled logging to file; specify path first
FIX: base class must be public to avoid exceptions
(e.g. OpenJDK6 throws IllegalAccessException)
FIX: all items and views should be serializable
to avoid problems with session state replication
ADD: ignore local changes to log4j settings
Merge remote-tracking branch 'origin/integration' into mjuliano
Merge remote-tracking branch 'origin/kreincke' into mjuliano
ADD: links in readme
ADD: formatting and linking
ADD: formatting and linking
ADD: formatting and linking
ADD: formatting and linking
ADD: formatting and linking
minor changes