Initial commit
Merge commit 'efdcf54b8f52855d3a596ace04fcd302c1c5ea55' into feature/machine-list
Initial commit
CodeIgniter upgraded to 2.1.3.

First prototype alpha release code of machines booking page. All project
design stage features included (even logging, which Tim said don't
bother with). CI makes these things relatively easy :-)
Merge branch 'feature/machine-list' into develop
Merge branch 'feature/machine-list' of https://github.com/ggpsystemsltd/ggp-intranet into release/1.0

Conflicts:
	README.md
Release 1.0: Alpha prototype for the people. Hopefully this will
encourage some suggestions for features.
Hotfix to release 1.0, removes the hover boxes from the configuration
and further information fields when they contain no information.

Signed-off-by: Murray Crane <murray.crane@gmail.com>