Eka päivitys 13.2.2014
Merge https://github.com/Redactory/Salaussovellus