Updated version numbers for 1.7
Made the keywords translatable
Made the keywords translatable (changelog update)
Updated translations with new strings
* Implemented capability checks
Add german language file and a small change for right display entities from language files.
add settings for network, multisite setup
fix grammar
Fixing conflicts.
Added @bueltge's contributions to changelog, fixes #9
Added capability checks to new Multisite actions.
Merge branch 'master' of git://github.com/Japh/wp-butler

Conflicts:
	wp-butler.php