Merge branch 'master' of C:\JavaProjects\hdc-web with conflicts.
Google autentication
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/securesocial.conf
Google autentication