Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Removed unnecessary refreshIndex from cpEntityManager.update()
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Updated pom.xml to properly include JSP servlet defs in web.xml on build
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
separated ES from C* in cloudformation template/scripts
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into cloudformation-update
more updates to cloudformation scripts
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into cloudformation-update
more cloudformation updates
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into cloudformation-update
more cloudformation updates
more cloudformation updates
more cloudformation updates
more cloudoformation updates