20141113
merge
Merge branch 'master' of https://github.com/solo123/wul
merge
Merge branch 'master' into background