Version 1.2.0
Merge branch 'master' of https://github.com/Luch/conventAccordion

Conflicts:
	README.md