fix
Merge branch 'master' of https://github.com/tomekpilat/conperioapp

Conflicts:
	package.json
Merge branch 'master' of https://github.com/tomekpilat/conperioapp

Conflicts:
	package.json
fix