Changes to sample.dat, forms.py, and gcal.py
Merge branch 'develop' of https://github.com/BaxterStockman/cloudendar into develop

* 'develop' of https://github.com/BaxterStockman/cloudendar:
  Reverting some changes to gcal.py
  Changes to forms.py and sample.dat
  Added working backup of gcal.py

Conflicts:
	src/data/sample.dat