Main class consolidated, removed all the perl but archived it for later use - i.e. when we refactor the login perl stuff to login and book hall
Removed Perl
Removing crs_ids to fix mergin problems
manual merge for barney
Merge pull request #20 from nickburscough/master

fixing merge problem