Initial commit new feature
some functionality added
finished the feature
Merge branch 'feature/feature_1' into develop
fixed some bugs
Merge branch 'release/release_2013-11-20'