Do not allow HTML media files - risk of XSS attacks
Remove redundant file includes/.htaccess

Conflicts:

	includes/.htaccess
Fix: carriage return characters not permitted in .PO files
Update .po files from latest code
Merge updated translations from master
#1248831 - unable to revert settings in admin area
URL of wiki
PGV import wizard - the wt_placelocation table has not been imported since 2012-10.
#1246728 - 'Changes log' finds too much on xref
#1205999 - Database table prefix ignored if it's empty
Years misformed in statistics charts
Number formatting error in statistics plot
Prevent page jumping to top when clicking on 'request new password' link.
#1210538 - Fan Chart Error in git
Shorter/simpler y-axis titles
Don't show (most) sidebar content to search engines
Upgrade jQuery from 1.9.1 to 1.10.2
REPO:OBJE links should be warnings, not errors
Family tree settings - use consistent order for hide/show
#1080013 - different notes are not shown if first line is the same