Merge branch 'dev'
1.1.4

Fix errors
1.1.5

Remove APC
Fix Errors
Merge branch 'master' into dev