Add Folder/Add Picture
Merge remote-tracking branch 'origin/master'

Conflicts:
	DigiPaper/app/src/main/java/wuhack2014/digipaper/DocumentList.java
	DigiPaper/app/src/main/java/wuhack2014/digipaper/FolderList.java