switched from mocks to REST, adapted api changes
preparing auth
merged from develop, misc api fixes
Merge pull request #95 from SchweizerischeBundesbahnen/feature/kgu/frontend-meets-backend

Feature/kgu/frontend meets backend
appended proxy params for aws, fix Ratingservice
Merge pull request #96 from SchweizerischeBundesbahnen/fature/kgu/fix-rating-and-proxy-aws

appended proxy params for aws, fix Ratingservice
Merge pull request #97 from SchweizerischeBundesbahnen/feature/gzi/server

Feature/gzi/server
fixed some JSHInt findings
Programmupdate Tech4 2014
Merge pull request #98 from SchweizerischeBundesbahnen/feature/mwa/jshintfindings

fixed some JSHInt findings
Merge pull request #100 from SchweizerischeBundesbahnen/feature/mwa/tech4update

Update des Tech4 Programms
Merge remote-tracking branch 'origin/develop' into feature/gzi/server

Conflicts:
	server/conferencebuddy-web/src/main/java/ch/sbb/conferencebuddy/UserResource.java