update hotfix to merge to testing and develop branches
Merge pull request #6 from invodo/feature/add_functional_testing_branch

Add testing branch capabilities