Finish hotfix-1
Finish feature-1
asdasd
Finish 1hotfix-1

Conflicts:
	readme.txt
feature 1
merging 'feature/f_git_1' into develop
updating poms for 0.0.1 release
updating poms for 0.0.1 release
Finish 0.0.1
f1
merging 'feature/f1' into develop
cambio en release 1
updating poms for 0.0.2 release
asd
Merge branch 'release/0.0.2' into develop
updating poms for 0.0.3-SNAPSHOT development
feature 1