Merge branch 'refactoring-20141221' into upstream/master
Fix assets precompile error.
Merge pull request #61 from JunichiIto/fix-css-compile-error

Fix css compile error