Fixing mainview. Settings button having an image and text. Doing rest of buttons
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml