Merge branch 'release-1.0' into develop
Merge branch 'master' into develop
rolling back
Merge branch 'master' into develop

Conflicts:
	loqale.1.0.js
Merge branch 'develop' of https://github.com/maroun-baydoun/loQale into develop
Merge branch 'release-1.0'