Merge branch 'release/release_2013-11-20'
hotfix bug 1
Merge branch 'hotfix/bug_1' into develop