Added Settings Form and file
Merged Settings_feature to Master