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 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 remote-tracking branch 'pubs-master/master'
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