insert files
Merge remote-tracking branch 'origin/master'

Conflicts:
	dfs/src/main/java/pl/edu/agh/dfs/controllers/ApplicationNavigationController.java
	dfs/src/main/java/pl/edu/agh/dfs/googledrive/DriveManager.java
Merge remote-tracking branch 'origin/master'
database connected, logging updated