Merge pull request #7 from pyp-navigation/master

同步所有项目分支
Merge pull request #13 from pyp-navigation/master

sycn all branch from c_qiushurong
测试commit
测试用
测试用
测试用
测试
1.
新增百度地图图标，添加了一个Activity(map_main_baiduMap),更新了MapFrament类，新添BaiduMapActivity。详见注释。

2. 在libs目录中添加了百度sdk的支持包。

3. 要String.xml文件中添加了一个item。详见注释。

4. 修改了AndroidManifext.xml文件。详见注释。
Merge pull request #25 from ICareYou/c_zhangweijie

合并  pull request  从  ICareYou/c_zhangweijie  到  pyp-navigation:c_zhangweijie
Merge branch 'master' into c_zhangweijie

Conflicts:
	pyp-navigation-base/gen/pyp/navigation/R.java

	modified:   pyp-navigation-base/AndroidManifest.xml
	modified:   pyp-navigation-base/bin/AndroidManifest.xml
	deleted:    pyp-navigation-base/gen/pyp/navigation/R.java
	modified:   pyp-navigation-base/res/values/array.xml
	modified:   pyp-navigation-base/src/pyp/navigation/main/MainActivity.java
	modified:   pyp-navigation-base/src/pyp/navigation/main/menu/RightMenuFragment.java
Merge branch 'c_zhangweijie'