Form Categories

Color and Camera Forms
Merge remote-tracking branch 'origin/master'

Conflicts:
	uPhone.html