correction css
correction css
logs
logs
just for backup
Merge remote-tracking branch 'origin/aikido' into aikido

Conflicts:
	examples/gcm/new.htm