reset!!!
Exclude credit.py file
Merge branch 'master' of github.com:sooop/w
Merge branch 'daily'

Conflicts:
	app/database/access.py
	  > config var name
	app/database/backup.py
	  > config var name, readability
	app/database/storage.py
	  > readibility
	app/templates/page.html
	  > additional links
	app/views/__init__.py
	  > remove import backup
	app/views/file.py
	app/views/page.py