Fix user settings precedence
Fix #1605 : Add advanced search reset on production load.
Fix #1621 : User query per last applied template triggers an error
Fix division by 0 in case a thumbnail has a width or height equal to 0
fix #1612

Conflicts:
	lib/classes/caption/Field/Value.php
fix #1612

Conflicts:
	lib/classes/caption/Field/Value.php
Merge pull request #837 from romainneutron/fix-1618

[3.8] Fix user settings precedence
Merge pull request #840 from romainneutron/width-height

[3.8] Fix division by 0 in case a thumbnail has a width or height equal to 0
Merge pull request #839 from romainneutron/fix-1621

Fix #1621 : User query per last applied template triggers an error
Merge pull request #838 from romainneutron/fix-1605

[3.8] Fix #1605 : Add advanced search reset on production load.
Fix #1607 Reoder collections is not working

Conflicts:
	lib/classes/collection.php
Fix #1623 Can not display empty admin fields list
Merge pull request #833 from nlegoff/fix_1607

[3.8] Fix #1607 Reoder collections is not working
Add tests
Fix #1626 : FTP test displays empty message
Fix #1625 : Append javascript autocompleter to edit dialog box
Fix #1629 : Update to PHP-FFmpeg 0.4.4
Merge pull request #842 from nlegoff/fix1623

[3.8] Fix #1623 Can not display empty admin fields list
Fix #1622 : Sanitize captions display
Merge pull request #844 from romainneutron/fix-1626

[3.8] Fix #1626 : FTP test displays empty message