Some commits are reversing..
Merge branch 'master' of https://github.com/brndnthai/plantivity
More updates
Revert "More updates"

This reverts commit 02461601861f115ad4623fe94926e61fdc95fd25.
Revert "Revert "More updates""

This reverts commit 8ed5c64e60bc8bd65d020e503887cbe815135211.
bleh
Merge branch 'master' of https://github.com/brndnthai/plantivity