shai - local merge
shai - DAL to cloud (only insert)
Merge branch 'master' of
ssh://git@github.com/ohadsch/AwesomePlaylists.git

Conflicts:
	AwesomePlaylists/AndroidManifest.xml
	AwesomePlaylists/src/com/example/awesomeplaylists/Activities/MainActivity.java
	AwesomePlaylists/src/com/example/awesomeplaylists/Activities/UserSettingsActivity.java
shai - try to figure wtf with git