NOJIRA:  Removing IDE-specific files from the project (per discussion with Anthony)
Convert annotations to portlet 2.0 versions
Merge remote-tracking branch 'upstream/master'
Setup spring context overlays config
Setup spring context overlays config
Merge branch 'master' into full-story-page