Merged new feature branch into master

Removed the following stale files

Conflicts:
	api.go
	db.go
	event.go
	search.go
	server.go
	source.go