file upload bug fixed
flag icon to show on final page of portrait style postcard
resolve merge conflicts