Merge pull request #8 from crowdfavorite/master

Very light changes to assist admin granularity
release 1.6.1
update list of known conflicts
version bump 1.6.1
granular control over display
update languages
version bump
Merge remote-tracking branch 'upstream/master'