trying to sync up
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/scripts/app.coffee
	app/scripts/controllers/country.coffee
	app/views/country.html
Merge remote-tracking branch 'origin/dev' into dev
Merge remote-tracking branch 'origin/dev' into dev
Merge remote-tracking branch 'origin/dev' into dev
Merge remote-tracking branch 'origin/dev' into dev
added deploy.sh