Add: local frousquare ids
Add: store email in db when first time connecting
Merge branch 'master' into github

Conflicts:
	conf/application.conf