added layout and class for add pokemon activity; swapped out butterknife jar for version 6.0.0