Add directories.
Merge branch 'master' of https://github.com/Kinokoh/googleDriveFaces

Conflicts:
	src/main/java/com/isima/zzdrive/model/Directory.java
	src/main/java/com/isima/zzdrive/service/UserService.java
	src/main/resources/com/isima/zzdrive/strings.properties
	src/main/webapp/templates/master.xhtml