30.05.2013 Add Site and Sc2tv
Merge remote-tracking branch 'origin/intellij_master' into intellij_master

Conflicts:
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/ActionProviderLink.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/AdapterChannelList.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/AdapterChatCursor.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/AddChannel.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/AddChat.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/ChatList.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/ChatService.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/DialogChekNameSc2tv.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/DialogChoiceSite.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/DialogChoiceSmile.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/DialogColorPicker.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/DialogLoadSavedChat.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/DialogSendChannels.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/DialogShowSc2tvApi.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/DialogSmilesBySite.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/DialogStopService.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/DialogTwitchChannels.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/FragmentFindChannelSc2tv.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/FragmentFindChannelTwitch.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/GetSc2tvCode.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/Help.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/IrcClient.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/Login.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/MainActivity.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/MyApp.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/MyContentProvider.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/Preference.java
	P001a2_StreamChat/src/ivied/p001astreamchat/Core/SendMessageService.java