On branch MenuLayer
 Changes to be committed: refractorization temporality ended
	modified:   src/portable/AppMacros.h
	modified:   src/portable/scene/MenuLayer.cpp
	modified:   src/portable/scene/MenuLayer.h
 On branch MenuLayer
 Changes to be committed:

Changes to be committed: refractorization temporality ended stage 2
	modified:   src/portable/AppDelegate.cpp
	modified:   src/portable/AppDelegate.h
	modified:   src/portable/AppMacros.h
	modified:   src/portable/scene/Levels.cpp
	modified:   src/portable/scene/Levels.h
	modified:   src/portable/scene/LoadLevel.cpp
	modified:   src/portable/scene/LoadLevel.h
	modified:   src/portable/scene/ShaderNode.cpp
	correiged a fatal bug (divede by 0)=nan
	modified:   src/portable/scene/Level1/L1GameLayer.cpp
	modified:   src/portable/scene/Level1/L1GameLayer.h
	modified:   .gitignore
	ignore the build resut of android project
Merge branch 'git-config' into Level1
Ignore the build result of android
Merge branch 'git-config' into Level3
Ignore the build result of android
Merge branch 'git-config' into MenuLayer
Ignore the build result of android
Merge branch 'git-config' into linux
Ignore the build result of android
Merge branch 'git-config' into project-config
Ignore the build result of android
	modified:   src/portable/scene/Level1/L1b2Sprite.h
	modified:   src/portable/scene/Level3/L3GameLayer.h
	modified:   src/portable/scene/ShaderNode.cpp
	modified:   src/portable/scene/ShaderNode.h
	modified:   src/portable/AppDelegate.cpp
	new file:   src/plataform/android/Makefile.am
	new file:   src/plataform/android/autogen.sh
	new file:   src/plataform/android/backup/MainActivity.java
	new file:   src/plataform/android/backup/autogen-old.sh
	new file:   src/plataform/android/backup/default-config.cfg
	new file:   src/plataform/android/backup/jni/Android.mk
	new file:   src/plataform/android/backup/jni/Application.mk
	new file:   src/plataform/android/backup/jni/main.cpp
	new file:   src/plataform/android/default-config.cfg
	new file:   src/plataform/android/file.in
	modified:   src/plataform/linux/Makefile.am
	modified:   src/plataform/linux/main.cpp
	modified:   src/plataform/linux/Makefile.am
	modified:   Makefile.am
	modified:   README
	modified:   autogen.sh
	modified:   configure.ac
	modified:   doc/Doxfile
	new file:   jenkins.sh
	new file:   Resources/IMG/320x480/MenuLayer/Brick.png
	new file:   Resources/IMG/320x480/MenuLayer/Striper.plist
	new file:   Resources/IMG/320x480/MenuLayer/Striper.png
	new file:   Resources/IMG/320x480/MenuLayer/Sun.png
	new file:   Resources/IMG/320x480/MenuLayer/audio-volume-high.png
	new file:   Resources/IMG/320x480/MenuLayer/audio-volume-low.png
	new file:   Resources/IMG/320x480/MenuLayer/audio-volume-medium.png
	new file:   Resources/IMG/320x480/MenuLayer/audio-volume-muted.png
	new file:   Resources/IMG/320x480/MenuLayer/credits_button.png
	new file:   Resources/IMG/320x480/MenuLayer/credits_button_pressed.png
	new file:   Resources/IMG/320x480/MenuLayer/exit.png
	new file:   Resources/IMG/320x480/MenuLayer/exit_pressed.png
	new file:   Resources/IMG/320x480/MenuLayer/play_button.png
	new file:   Resources/IMG/320x480/MenuLayer/play_button_pressed.png
	new file:   Resources/IMG/320x480/MenuLayer/sliderProgress.png
	new file:   Resources/IMG/320x480/MenuLayer/sliderProgress_1.png
	new file:   Resources/IMG/320x480/MenuLayer/sliderThumb.png
	new file:   Resources/IMG/320x480/MenuLayer/sliderTrack.png
	new file:   Resources/IMG/320x480/MenuLayer/sliderTrack_1.png
	new file:   Resources/IMG/320x480/MenuLayer/speaker1.png
	new file:   Resources/IMG/320x480/MenuLayer/speaker3.png
	new file:   Resources/IMG/320x480/MenuLayer/speaker5.png
	new file:   Resources/IMG/320x480/MenuLayer/splash_screen.png
	modified:   Resources/Shaders/MenuLayer/Sun.fsh
Merge branch 'git-config' into testing
ignorein the output of android project
Merge branch 'Level1' into testing