Trying to correct directory structure again without losign files.
Merge branch 'master' of https://github.com/stewartbryson/gcbc

Conflicts:
	gcbc_initial.rpd
	gcbc_master.rpd
initial rpd creation
Staff DOB and init block
new measures
Merge branch 'branch2'
presentation fixes
calc measure
calc measure
test manual fix
Merge branch 'branch1'
calc2
calc2
Admin Tool equalize
Admin Tool Compare
start demo3
Merge branch 'master' into branch2
calc#1
calc#1
calc#1