dropbox
**logger
Merge branch 'master' of https://github.com/afish/toik_2014

Conflicts:
	cloudsync-dropbox/src/main/java/pl/agh/iet/i/toik/cloudsync/dropbox/service/AuthService.java