first feature initial commit
final feature done
feature acabada
Merge branch 'feature/feature-001-20140205' into develop
Merge branch 'release/rc-1.0.0_20140205'