fixed some bugs
Merge branch 'release/release_2013-11-20' into develop