Merge branch 'site' into 'master'

LICENSE.txt

doc/images/carousel_analysis.xcf

doc/images/carousel_stages.xcf

doc/images/carousel_threads.xcf

pom.xml

src/site/fml/faq.fml

src/site/markdown/contribute.markdown

src/site/markdown/download.markdown

src/site/markdown/index.markdown

src/site/markdown/news.markdown

src/site/markdown/wiki

src/site/resources/LICENSE.txt

src/site/resources/images/bg_gross.png

src/site/resources/images/carousel1.png

src/site/resources/images/carousel2.png

src/site/resources/images/carousel3.png

src/site/resources/images/teetime.svg

src/site/resources/wiki/.htaccess

src/site/site.xml