ignore php files and assets (in develop) as these should never be committed; master will need to allow committing of these files however
Merge branch 'develop' into feature-markup