Merge branch 'hotfix/1.3.3' into develop
Merge branch 'master' into develop
Added first paragraphs for 'Opensourcehippies'
Added paragraph about cloud computing in 'Opensourcehippies'
Added first paragraph about democracy in 'Opensourcehippies'
Merge branch 'master' into develop
Updated Ruhoh to v2.5
Merge branch 'release/1.4.0'