Added attributes for exporting archives
Merge branch 'master' into db

Conflicts:
	.gitignore
Merge branch 'db' of github.com:penguin359/lifelogger into db