Merge branch 'Front-End'
Revert 6d3cdc9..fe32f45

This rolls back to commit 6d3cdc9aba9033d037ea9914d4b7c28239db0468.
Insignificant style changes
Revert 280a9d0..2f760e9

This rolls back to commit 280a9d0a8ef08b05c7dea97da097ca2d32bd08ff.
Revert 83594d9..e73e14a

This rolls back to commit 83594d91cf5956593013841739b22c9e90e22e0e.
Revert fe32f45..7a3aeb9

This rolls back to commit fe32f45af275f726abb4e3913665578c52b0d1c0.
Merge branch 'master' into Front-End