**began merging process to server side structure
Merge branch 'master' of https://github.com/YRSTeamHTHS/YRS2013UK
Merge branch 'master' of https://github.com/YRSTeamHTHS/YRS2013UK