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

Conflicts:
	cloudsync-root/src/main/java/pl/agh/iet/i/toik/cloudsync/CommandLineApp.java