Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

# Conflicts:
#	src/components/ChronicInfo/index.jsx