Add wifidirect and crop photo

including UI and changes in activity and menifest
Resolve conflict

As title