Initial commit
merge master
update redirect setting
commit 20130514