Merge tag '201410171005' into develop

Version 201410171005 201410171005
Added Pelican site - phase 1 ended
Version bumped
Merge branch 'release/201410281638'