Refactored PreferencesDialog to an actual GTK Window
NoteTemplate is now forced to Above All.
These changes related to bgo #527177
Merge branch 'master' of ssh://git.gnome.org/git/tomboy
Merge branch 'master' of ssh://git.gnome.org/git/tomboy
Merge branch 'master' of ssh://git.gnome.org/git/tomboy
Address bug 666562 removing resource files
A smashing of patches applied
Merge branch 'master' of git://git.gnome.org/tomboy

Conflicts:
	Tomboy.csproj
Merge branch 'master' of git://git.gnome.org/tomboy
Merge branch 'master' of git://git.gnome.org/tomboy
Merge branch 'master' of git://git.gnome.org/tomboy
Fix bgo #681542 Tomboy.exe will not continue running

Hopefully adding the try / catch block will fix an exception when the Addin Manager cannot read the Addin description.
Merge branch 'master' of git://git.gnome.org/tomboy
Bug 670928 - cmdline ignored if Tomboy is running

Command line arguments get ignored if Tomboy is already running.
This is caused by named mutexes which, since Mono 2.8 [1], work only if
the MONO_ENABLE_SHM environment variable is set.

I assume this setting was changed for a good reason and we now use DBus
for single-instance detection.

[1] http://www.mono-project.com/Release_Notes_Mono_2.8#Shared_handles_are_disabled_by_default

Signed-off-by: Jared Jennings <jjennings@src.gnome.org>
Merge remote-tracking branch 'upstream/master'
Addressed bgo#687418 by making the example match default bound keys.
It would be nice if the example demonistrated other examples.
Really though we should capture key inputs so that the user
doesn't have to know the correct syntax.
Merge branch 'master' of ssh://git.gnome.org/git/tomboy
Merge branch 'BGO687418_HotkeyPreferencesTab'
Addresses Preferences Dialog confusion with Hotkey Examples.
Merge branch 'master' of ssh://git.gnome.org/git/tomboy
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'