Resolved conflicts
Merge branch 'master' of https://github.com/abrj/BAAAP
Merge branch 'master' of https://github.com/abrj/BAAAP