Fixed problems in master, missing removed Activity from manifest in some
of the latest commits. Always check so everything works before you
commit to the master.