misc upgrades to add, making sure it is 1.0 worthy
Merge branch 'master' of github.com:euranium/Aquatics-Site