Added feature 1
Merge branch 'Feature1' into develop
Fixed travis yml tab spaces
Merge branch 'ErrorInTravis' into develop
Merge branch 'release-0.1'