Merged development into master

This commit is contained in:
NelsonLaQuet 2013-09-01 02:02:25 -05:00
commit 28a029e0e5