server update
server merge
Merge branch 'master' of github.com:Eventalist/Eventalist into theerickramer
scheduled api calls
Merge pull request #23 from Eventalist/theerickramer

Theerickramer