closes #40
windows issues on git
Merge branch 'master' of github.com:intermine/design-materials

Conflicts:
	archive/posters/postermodENCODE2010print.graffle/Icon
	archive/posters/postermodENCODE2010print.graffle/data.plist
	archive/posters/postermodENCODE2010print.graffle/image26.png
	archive/posters/postermodENCODE2010print.graffle/image27.png
	archive/posters/postermodENCODE2010print.graffle/image30.png
	archive/posters/postermodENCODE2010print.graffle/image31.png
	archive/posters/postermodENCODE2010print.graffle/image32.png
	archive/posters/postermodENCODE2010print.graffle/image33.png
	archive/posters/postermodENCODE2010print.graffle/image34.png
	archive/posters/postermodENCODE2010print.graffle/image35.png
	archive/posters/postermodENCODE2010print.graffle/image47.png
	archive/posters/postermodENCODE2010print.graffle/image48.png
	archive/posters/postermodENCODE2010print.graffle/image49.png
	archive/posters/postermodENCODE2010print.graffle/image50.gif
	archive/posters/postermodENCODE2010print.graffle/image51.jpg
	archive/posters/postermodENCODE2010print.graffle/image52.gif
	archive/posters/postermodENCODE2010print.graffle/image53.gif
	archive/posters/postermodENCODE2010print.graffle/image9.tiff
	archive/presentations/InterMine_IB08_talk.key/.typeAttributes.dict
	archive/presentations/InterMine_IB08_talk.key/Contents/PkgInfo
	archive/presentations/InterMine_IB08_talk.key/Picture 16.png
	archive/presentations/InterMine_IB08_talk.key/Picture 3.png
	archive/presentations/InterMine_IB08_talk.key/Picture 5.png
	archive/presentations/InterMine_IB08_talk.key/data_integration.png
	archive/presentations/InterMine_IB08_talk.key/index.apxl.gz
	archive/presentations/InterMine_IB08_talk.key/intermine_architecture_colour.png
	archive/presentations/InterMine_IB08_talk.key/query_builder_new.png
	archive/presentations/InterMine_IB08_talk.key/thumbs/mt0-0-4.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/mt0-58.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/mt0-59.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/mt0-60.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/mt0-61.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/mt0-62.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/mt0-63.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/mt0-64.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/mt0-65.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/mt0-66.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/mt0-67.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/mt0-68.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/mt0-69.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/mt0-70.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st0-5.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st1-5.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st10-5.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st11-6.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st14.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st17-2.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st17.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st18-2.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st19-2.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st2-7.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st20-1.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st20-2.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st3-5.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st4-5.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st5-5.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st5.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st6-5.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st8-5.tiff
	archive/presentations/InterMine_IB08_talk.key/thumbs/st9-5.tiff
	archive/presentations/InterMine_IB08_talk.key/webapp_page_flow.png
	archive/presentations/modmine/gbfly.png
	archive/presentations/modmine/gsftool.png
	archive/presentations/modmine/mod2011_handout_2sided.pdf
	archive/presentations/modmine/mod2012_handout_2sided.pdf
	archive/presentations/modmine/modENCODE_DCC_2011_abstract.doc
	archive/presentations/modmine/modENCODE_for_ENCODE_meeting_6.pdf
	archive/presentations/modmine/modmine_fly_meeting.pdf
	archive/presentations/modmine/postermodENCODE2012vert.pdf
	archive/reports/intermine_report.sxw
	archive/techtalks/kmr_eclipse_perl_talk/techtalk.html
	archive/techtalks/kmr_eclipse_perl_talk/ui/print.css