Merge origin/master

Conflicts:
	documenttracker-db_2014-06-22.sql
	functions.php
	index.php