favicon
Merge remote-tracking branch 'upstream/master'
new ko-op site for may 2014
took out gfy
merged changes
Merge branch 'seemo-master'