Another line break / hr
Merge branch 'release/26092013-initial'
Added ignore file
Merge branch 'hotfix/add-gitignore' into develop
Merge branch 'develop' into live-site