Theme2
Merge branch 'master' into theme2

Conflicts:
	_site/.android/android-detect-adblocking/index.html
	_site/.java/.maven/continuous-delivery-using-maven-shell/index.html
	_site/.java/.maven/ejb-client-package-jrebel-glassfish/index.html
	_site/.java/.maven/work/getting-source-revision-for-a-deployed-app-using-maven-and-a-servlet/index.html
	_site/.java/.shell/thoughts/first-thoughts-on-os-x-lion/index.html
	_site/.java/.wicket/work/intellij-external-library-propertykey-how-to/index.html
	_site/.js/work/les-nouveautes-de-prototype-1-7/index.html
	_site/.shell/work/alerta-jul-elegant-log-tailing/index.html
	_site/.wicket/wicket-chrome-to-idea/index.html
	_site/assets/fonts/FontAwesome.otf
	_site/assets/fonts/fontawesome-webfont.eot
	_site/assets/fonts/fontawesome-webfont.svg
	_site/assets/fonts/fontawesome-webfont.ttf
	_site/assets/fonts/fontawesome-webfont.woff
	_site/atom.xml
	_site/index.html
	_site/page14/index.html
	_site/work/devoxx-france/index.html
	_site/work/hp-touchpad-quick-hacks/index.html
Removed _site
Merge branch 'master' into theme2

Conflicts:
	_config.yml