lettuce experiments
Merge remote-tracking branch 'pubs-master/master'

Conflicts:
	pubs_ui/Lettuce_Tests/features/test_utils.feature
	pubs_ui/Lettuce_Tests/features/test_utils.py
	pubs_ui/Lettuce_Tests/features/test_utils_2.feature
	pubs_ui/Lettuce_Tests/features/test_utils_2.py
Merge pull request #47 from jkreft-usgs/master

add some logging
Merge pull request #48 from jkreft-usgs/master

made browse replace configurable, see if it works with updated local_set...
Merge remote-tracking branch 'pubs-master/master'

Conflicts:
	pubs_ui/Lettuce_Tests/features/test_utils.py
	pubs_ui/Lettuce_Tests/features/test_utils_2.py
Merge pull request #49 from jkreft-usgs/master

added empty BROWSE_REPLACE string to make build possible
Merge remote-tracking branch 'pubs-master/master'
Merge pull request #50 from jkreft-usgs/master

added flask-images for PUBSTWO-1076
Merge remote-tracking branch 'pubs-master/master'

Conflicts:
	pubs_ui/templates/publication.html
Merge pull request #51 from ayan-usgs/master

merge of no major changes
Merge remote-tracking branch 'upstream/master'