zip file containing server extension
some cleanups
Merge branch 'spring-gx-dallas-2014', remote-tracking branch 'origin' into spring-gx-dallas-2014
some cleanups