Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/ae-subs-tracking/src/main/java/uk/ac/ebi/fg/annotare2/autosubs/SubsTracking.java
removed session cookie as it allowed only in servlets 3.0. We can't really use it as GWT uses jetty by default and it is pretty old
context and jetty-web groovy templates updated