Signup form - Angular
Registration of profiles`
Add chat functionality
Chat system client side
new things
Chat styling / Geolocation map
Correction of the website following Pascal recommendations
Mise a jour du texte du manifeste
Facebook login
Facebook profiles
Clean unsynced files
Merge branch 'master' of https://github.com/briancouchman/Flink

Conflicts:
	.gitignore
	api/Gruntfile.js
	api/package.json
	api/server/index.js
	app/www/config.xml
	app/www/img/profiles/serialsinners.jpg
	app/www/img/profiles/sexplorateurs.jpg
	app/www/index.html
	app/www/scripts/controllers/device-controller.js
	app/www/scripts/controllers/login-controller.js
	app/www/scripts/controllers/search-controller.js
	app/www/scripts/directives/logger-directive.js
	app/www/scripts/services/geolocation-service.js
	app/www/scripts/services/login-service.js
	app/www/scripts/services/profile-service.js
	app/www/scripts/services/search-service.js
	app/www/views/search.html
	website/public/assets/css/bootstrap-theme.css
	website/public/assets/css/main.css
	website/public/assets/images/bg_header.jpg
	website/public/index.html
	website/public/signup.html
	website/v1/index.html