Major App Update

Major android app rewrite for SITF