added trainer MVC
Merge branch 'master' of https://github.com/thomastuts/artedex-client

* 'master' of https://github.com/thomastuts/artedex-client:
  Removed pokemon images
  Add AJAX file upload
  Include foundation & rework basic style for development
trainer page
fix merge confict
Merge branch 'thomas'
Merge branch 'thomas'

Conflicts:
	app/scripts/controllers/scan.js
filters overview
Merge branch 'master' of https://github.com/thomastuts/artedex-client

* 'master' of https://github.com/thomastuts/artedex-client:
  Only perform catches save if the pokemon hasn't been caught already
  Sync catches to database
  Mark pokemon as caught when scanned for localstorage
  Mark pokemon as caught when scanned for localstorage
  Add manual input fallback
Fix all specimens showing up in catches
Merge branch 'master' of github.com:thomastuts/artedex-client
sleep
Code review
Additional code cleanup