Merge pull request #491 from AgileVentures/develop

Pushing Develop to Staging
Merge pull request #493 from AgileVentures/staging

Pushing Staging to Production
Merge branch 'master' of https://github.com/AgileVentures/WebsiteOne into develop
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into develop
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into develop
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into develop
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into develop
ends_time --> end_time for ice_cube schedule
all specs passing
all specs passing
program behaving well..
but 32 features failing
small event@end_time related changes, and fixed a bug by removing .time from  ['time'].time
project landing template rough progress
fix of UI (margin issues and coloring) on Scrum timeline
change documents sections
Changes in the feature according to comments from Yaro
fixing all of Yaro's comments and adding some tests for the documents_controller
changes according to comments from Sampriti
fixing Bryan's comments
add rescue for update_parent_id
pong to Sly: add tests for sad path