Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'master' into beta
Some minor updates

Changed some colors & stuff.. TImeline..