Merge pull request #125 from dewguzzler/master

sorry another pull request
updated Main activity with social feature
Merge remote-tracking branch 'upstream/master'

Conflicts:
	res/menu/app_menu.xml
added icons for menu and preparing for the social feature
Merge pull request #126 from crystalist/master

Added icons for menu items
updating the social feature to fix app
Merge pull request #127 from crystalist/master

Fixed social feature to fix app