Updated version number
Implemented output enhancements to Ape.log()
Updated version number to 1.1.3-DEV
Merge pull request #39 from ptejada/master

Implemented output enhancements to Ape.log()
Fix merge conflict
Merged from upstream APE-Project/APE_Server