Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
fixes #13 Now template option is a TemplateOptions object instead of an array
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
fixes #18 Merge branch 'develop'
Merge branch develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge pull request #24 from acelaya/develop

Added PHP 5.6 and HHVM to tested environments
Merge branch 'develop'