Updated readme to reflect release of v3.0.4.
Updated build version to v3.0.4.
Updated v3.0 branch to v3.0.5-a1.
Resolved merge conflicts.