- added branch 20140204-federated-android
- added branch 20140204-federated-android
- fixed merge conflict in MediaEngine class
Added Android build scripts for core and stack
Android build script for core and stack now supports C++ 11. Toolchain switch from 4.4.3. to 4.7.
Roof android build script created. Minor fix for compilation purposes.
- tabbed skeleton control for contacts list and settings view
- proper way to set default tab control
Added roof build script. Added prebuilt libz.so
- main view now launches web view
- got the inner / outer messaging frame working for the login
Merge branch '20140204-federated-android' of https://github.com/openpeer/opandroid into 20140204-federated-android

# By Bojan Lazic
# Via Bojan Lazic
* '20140204-federated-android' of https://github.com/openpeer/opandroid:
  Added roof build script. Added prebuilt libz.so
openpeer-android-sdk initial fix
- added new tab for media testing
Merge branch '20140204-federated-android' of https://github.com/openpeer/opandroid into 20140204-federated-android
Added script to copy files from development folder to sdk folder. fixed delegate implementation.
- handle menu button from contact list
- prevent "back" button from login when not logged in
- added badge view implementation
- more skeleton in place
Merge branch '20140204-federated-android' of https://github.com/openpeer/opandroid into 20140204-federated-android

# By Bojan Lazic (2) and Vladimir Morosev (1)
# Via Bojan Lazic (1) and Vladimir Morosev (1)
* '20140204-federated-android' of https://github.com/openpeer/opandroid:
  Added script to copy files from development folder to sdk folder. fixed delegate implementation.
  - added new tab for media testing
  openpeer-android-sdk initial fix

Conflicts:
	OpenPeerSampleAppCSharp/OpenPeerSampleAppCSharp/OpenPeerSampleAppCSharp.csproj
	OpenPeerSampleAppCSharp/OpenPeerSampleAppCSharp/Resources/Resource.designer.cs
- ignore userprefs file
- created contact list item layout
- list view with badge, custom icon on right side and clickable list itmes