Merge branch 'master' into dev-viksit

Conflicts:
	.gitignore
	Gemfile.lock
working state on my computer
Merge branch 'master' into dev-viksit

Conflicts:
	.gitignore
	Gemfile.lock
pulled lates changes