merging integration
Merge branch 'integration' of github.com:moai/moai-dev into integration

Conflicts:
	samples/anim/anim-curve/main.lua
	samples/anim/anim-driver/main.lua
	samples/anim/anim-flipbook/main.lua
	samples/anim/anim-listener/main.lua
	samples/anim/anim-span/main.lua
	samples/anim/chase-bridge/main.lua
	samples/anim/chase/main.lua
	samples/app/app-apsalar/main.lua
	samples/app/app-connectivity/main.lua
	samples/app/app-tapjoy/main.lua
	samples/audio/audio-untz/main.lua
	samples/camera/camera-fitter/main.lua
	samples/deck/scriptDeck/main.lua
	samples/deck/tileDeck2D-grid/main.lua
	samples/deck/tilemap-animated/main.lua
	samples/deck/tilemap-expand-for-sort/main.lua
	samples/font/font-bitmap/main.lua
	samples/font/font-serialize/main.lua
	samples/font/font-texture-colors/font.lua
	samples/font/font-ttf/main.lua
	samples/font/font-utf8/main.lua
	samples/graphics/gl-frameBuffer/main.lua
	samples/graphics/gl-shader-attributes/main.lua
	samples/graphics/gl-shader-color/main.lua
	samples/graphics/gl-vertexBuffer/main.lua
	samples/grid/grid-diamond/main.lua
	samples/grid/grid-hex/main.lua
	samples/grid/grid-oblique/main.lua
	samples/image/image-fillRect/main.lua
	samples/input/input-picking/main.lua
	samples/layer/layer-bridge/main.lua
	samples/layer/layer-camera/main.lua
	samples/layer/layer-parallax/main.lua
	samples/layer/layer-sort/main.lua
	samples/log/custom-log-messages/main.lua
	samples/particles/particles-states/main.lua
	samples/pathfinding/pathfinding-diamond/main.lua
	samples/pathfinding/pathfinding-hex/main.lua
	samples/pathfinding/pathfinding/main.lua
	samples/physics/physics-box2d/main.lua
	samples/physics/physics-chipmunk/main.lua
	samples/prop/debugLines-prop/main.lua
	samples/prop/prop-uvTransform/main.lua
	samples/sim/sim-step-fixed/main.lua
	samples/sim/sim-step-multi/main.lua
	samples/textbox/textBox-alignment/main.lua
	samples/textbox/textBox-escapes/main.lua
	samples/textbox/textBox-highlight/main.lua
	samples/textbox/textBox-nested-styles/main.lua
	samples/textbox/textBox-newlines/main.lua
	samples/textbox/textBox-paging/main.lua
	samples/textbox/textBox-traits/main.lua
	samples/textbox/textBox-update-style/main.lua
	samples/texture/multitexture/main.lua
	samples/texture/multitexture/shader.fsh
	samples/texture/multitexture/shader.vsh
	samples/texture/texture-mipmap/main.lua
	samples/texture/texture-pvr/main.lua
	samples/texture/texturepacker/main.lua
	samples/transform/traits/main.lua
	samples/util/util-base64/main.lua
	samples/util/util-deflate/main.lua
	samples/util/util-http-async/main.lua
	samples/util/util-http-blocking/main.lua
	samples/util/util-https/main.lua
	samples/util/util-json/main.lua
	samples/util/util-parser/main.lua
	samples/util/util-parser/simple.grm
	samples/util/util-parser/test.txt
	samples/util/util-serialize-to-header/main.lua
	samples/util/util-serialize/main.lua
	samples/util/util-xml/instructions.xml
	samples/util/util-xml/main.lua
	samples/util/util-xml/menu.xml
refactored MOAIEaseDriver to inherit MOAITimer; modified MOAIEaseDriver to support timer loop modes (issues #127); implemented small optimization in animation helper functions (MOAIEaseDriver links will now be omitted if no move* or seek* value is specified for param)
Merge branch 'integration' of github.com:moai/moai-dev into integration
Fix iOS sample project build.
fixed friend of self warning in MOAIHttpTaskCurl; changed MOAIEaseDriver SetLength to SetSpan in MOAIUntzSound
Merge branch 'master' into integration
merged from master, changed mt.default to anim/anim-basic
fixed MOAIEaseDriver/MOAITimer cycle count bug (cycle wasn't getting set to 1 or -1 on end of normal one-shot run)
extending timer behavior to include CONTINUE and CONTINUE_REVERSE (to work with anim curve wrapping modes)
Rename MOAICrittercism.
Merge.
Fixes for delta step in anim-curve

Test Notes: Modify anim-driver to use wrap modes and see that it works as intended
Updated backward-compat interfaces.
Capitalize i in IOS.
Unify Tapjoy.
Unify Facebook.
Unify Notifications.
Move Android billing support to an Android-specific implementation.
changing implementation of MOAIEnvironment to use Lua table instead of getter/setter methods; added ClearField to MOAILuaState