Map Marker Animation
Merge branch 'master' of github.com:TeamGlorious/explorify

Recursive Merge
Add OAuth for Instagram
Merge branch 'dev'

Merge Conflict Resolved