still working on validation
validation working I think
Merge branch 'master' of https://github.com/PhoenixRockit/Team-Synergy-Team