recommit files
merge
Merge github.com:Mackingzie/Avalaunch

Conflicts:
	application/logs/log-2013-03-19.php