merge
Merge branch 'master' of https://github.com/A-StadLabs/oauthExperiment

Conflicts:
	public/apps/aos-babbles/ba-elements/babbel-babbel/babbel-babbel.html
	public/apps/aos-babbles/ba-elements/cl-voteitem/cl-voteitem.html