added IDEA config files, resolved project conflicts to run on device