Settings Activity in progress

Merged Settings activity with master