feature 1.1
Merge branch 'develop' of https://github.com/sangcu/gitflow into feature/Lam-1.1

Conflicts:
	README.md
Merge branch 'feature/Lam-1.1' into develop