Increased pill bottle capacity to 14 pills (2 rows).
Also fixed #2714.
Merge branch 'master' of https://github.com/Spamcat/Baystation12