Merge branch 'hotfix/update_readme'
Merge branch 'release/release-20140522'
fix template errors
Merge branch 'hotfix/fix_template_errors' into develop