changes
Merge branch 'master' of https://github.com/timtraver/rcvault

Conflicts:
	php/templates_c/6047d66792b96235dbaae201a19708a0e049b7cd.file.event_list.tpl.php
	php/templates_c/8dcd6e50940577ff5eda1d61dfa9b0bc15b7fa28.file.event_edit.tpl.php