working on ivy
Merge branch 'master' of github.com:andriyamm/secret-octo-hipster

Conflicts:
	ivy.xml
working on ivy
merge ivy
working on ant ivy
working on ant ivy