Merge pull request #145 from MargaretLangley/master

Migrations have timestamp set to allow null
Merge pull request #146 from MargaretLangley/master

Bug fix for Xmas error in cycle show ie 5 in 25
Clearing <br>