Revert "Merge branch 'dev' of /home/adam/Wikia/app with conflicts."

This reverts commit 8352869db1060758f152ad990797c9c8ce7363a2.