Fixed formatting errors and corrected /development/xxxx to /dev/xxxx to avoid conflicts with development branch, which I just created.
Merge branch 'development'