getting new versiono
Merge branch 'master' of https://github.com/rnecesito/vetro

Conflicts:
	client/templates/application_form.html
	client/templates/oauth.html