noise profile: fujifilm x100s
Merge remote-tracking branch 'upstream/master'
Update noiseprofiles.h with camera Olympus E-M10

I added lines 1427 through 1450 with the noise profile data for the new Olympus OM-D E-M10.
Matthias Grocholl, Köln
Merge remote-tracking branch 'upstream/master'
Revert "699: explicitly shield dev->image_storage with a mutex"

This reverts commit 6d5b72bd13f21be16f9a13c12abe8db5f1f84a90.
Revert "699: some aftermath, set correct image id first time around."

This reverts commit 4d80fef9648c6924461b16f00e25f3215c912bfa.
Revert "Rework when reload_defaults gets called"

This reverts commit 6697fa5cb057a584af63935606c8bd791b7bbcc8.
Revert "Run reload_defaults only once after img is loaded"

This reverts commit 31078c9f86d6b671a873e88f3203ebf70e4d5291.
Revert "Don't keep thumbs if we've dropped the metadata"

This reverts commit 0c37ddd9ca9b26a0bfc8ef2abf1d786751de638a.
Revert "Fix raw parsing race condition"

This reverts commit 55d1c9204892021c3f7fc04d1e6ee2159399cca1.

Conflicts:
	src/develop/develop.c
699: force blocking acquisition of full buffer when entering dr mode.

also when changing filmstrip.
699: factor out raw loading into one function
Rework when reload_defaults gets called

Revert "Revert..
This reverts commit bf3048ca1e44894a163ad675b8ab511403a4cfb2.
699: fix reload defaults for dr, filmstrip, and thumbnails.
reload_defaults before gui_update/gui_init when changing images
lua : various minor fixes to documentation generation
wb_presets: nikon d800(e) update stolen from ufraw
699: clean up calls to reload_defaults.

the order should be:
gui_init
reload_defaults
gui_update
usermanual: proofreading thanks to David Vincent-Jones
Merge branch '699'

again.