add more detailed instructions on how to set up waltz for development
Merge branch 'develop' into contribution-guide

Conflicts:
	README.md
Merge pull request #273 from waltzio/contribution-guide

add more detailed instructions on how to set up waltz for development