updated gitignore
Merge branch 'master' of github.com-pocketcampus:PocketCampus/pocketcampus
minor update
minor update
Merge branch 'master' into ios_client_2.0