custom css 03/06/2014 v1.0
Merge branch 'master' of https://github.com/Petitnomad/nomad

Conflicts:
	src/main/resources/META-INF/web-resources/css/custom.css