Fixed ubuntu 13.04 issues
Fixed flatview load bug
Merge branch 'refactor2' into refactor