Merge github/master

Conflicts:
	documenttracker-db_2014-06-22.sql
	functions.php
	index.php
	nbproject/project.properties
	plugin/noty-2.2.4/js/noty/layouts/center.js