entries
Merge branch 'master' of https://github.com/landakram/radar

Conflicts:
	templates/show_entries.html
keyword improvement
Merge branch 'master' of https://github.com/landakram/radar