Minor changes
Merge branch 'master' of git://github.com/siejen/2014WDI_SuperGrp into dev
update from team
bug fixes
Merge branch 'dev' of https://github.com/SalamanderMike/2014WDI_SuperGrp into dev

Recombining my dev