Merge branch 'develop' of http://github.com/eu-osha/osha-website into develop
Fixed bug where drupal ignore id '0'
Merged and fix confloct pull req 113
Merge branch 'eugenst-develop' into develop