Update atmosphere to snapshot version, add war overlay plugin to example project
Merge atmosphere changes