FixMyBarangay: allow boilerplate strings to act like prefix or suffix, closes MM #166
fixed whitespace/indenting
Merge remote branch 'origin/master'