Heavy testing done

Email updated
Client testing with iPad integrated