Rails upgrade
Downgraded macaddr
Jquery upgrade
Downgraded net-ssh
Downgraded net-ssh
Merged master and resolved conflicts