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
fixed two failing specs. DateTime issues
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
Merge pull request #518 from tochman/develop

Fixed for failing specs.
Adding first part of the story - feature tests - almost working
Story works. Just the jasmine test is pending
jasmine test now working. jQuery animations turned off
fix errors in the cucumber test
recommitting to make travis pass
fix of UI (margin issues and coloring) on Scrum timeline
Merge pull request #517 from betasve/document_revisions

Document revisions