Add manual input fallback
Merge branch 'thomas'
Mark pokemon as caught when scanned for localstorage
Mark pokemon as caught when scanned for localstorage
Fix some conflicts
Sync catches to database
Only perform catches save if the pokemon hasn't been caught already
Merge branch 'thomas'

Conflicts:
	app/scripts/controllers/scan.js