20141230 progress in layouts
Merge branch 'develop' of https://github.com/kevinzhoucn/teapot1212 into develop