Merge branch 'dev-3'
Merge branch 'master' of https://github.com/basercms/basercms into dev-3
条件分岐の整理
Windows Vista 以降と Mac OS X Mavericks のデバイスフォントに対応
Merge branch 'prototype' of https://github.com/tecking/basercms into prototype