Merge branch 'release/release_2013-11-20' into develop
Merge branch 'hotfix/bug_1' into develop
new feature added
made some changes
finished new feature
added a new feature
made some changes
finished feature 3
Merge branch 'feature/new_feature_3' into develop
Merge branch 'feature/new_feature_2' into develop
final changes
Merge branch 'release/release_2013-11-20.1'