Merge remote-tracking branch 'github-rockdot-origin/master'

Conflicts:
	rockdot/.gitignore
Merge remote-tracking branch 'github-rockdot-origin/master'