push from server
Merge branch 'master' of https://github.com/earthlinkdesign/cdkstone

Conflicts:
	database/cdkstone.sql