complete 2014 05 12
Merge branch 'master' of github.com:ZionPi/zionpi.github.com