move file to follow common CFWHeels file structure
move file to follow common CFWHeels file structure
move file to follow common CFWHeels file structure
move file to follow common CFWHeels file structure
m
move file to follow common CFWheels structure
Merge remote-tracking branch 'origin/step2' into step3
move file to follow common CFWHeels file structure
move file to follow common CFWHeels file structure
move file to follow common CFWHeels file structure
move file to follow common CFWHeels file structure
move file to follow common CFWHeels file structure
alow clean up Railo and CFWHeels
Merge remote-tracking branch 'origin/step2' into step3
adapt datasource name to follow defaults
Merge remote-tracking branch 'origin/step2' into step3
adapt datasource name to follow defaults
adapt datasource name to follow defaults
Merge remote-tracking branch 'origin/step3' into step4

Conflicts:
	controllers/Users.cfc
	views/users/new.cfm