Updated ignore
Added application server and links to CF gitlab for testing
Merge branches 'master' and 'develop'