Squashed commit of the following:

commit bc196ed204a3a8226369478cc76b98d2799dc44f
Author: Matthew Pierpont <mpierpont@bannerengineering.com>
Date:   Fri Oct 31 14:23:25 2014 -0500

    update to ECO 121297

commit 73eb1256854ee599b73e83b195f5c384021c6c49
Merge: 62bda19 f6555f5
Author: Matthew Pierpont <mpierpont@bannerengineering.com>
Date:   Fri Oct 31 14:22:45 2014 -0500

    Merge branch 'master' into ECO/121297_Q3X_Firmware

commit 62bda19375de0ddab1d878727f0dd9343524ec52
Author: Matthew Pierpont <mpierpont@bannerengineering.com>
Date:   Wed Oct 29 07:26:59 2014 -0500

    ECO 121297 Release
Squashed commit of the following:

commit 8463fcbb8f31235ebbe1beac3cacfa8ca9abfe5c
Author: Matthew Pierpont <mpierpont@bannerengineering.com>
Date:   Fri Nov 7 08:30:13 2014 -0600

    ECO 121295 release after changes from verification

commit c76fe15a9fb837bfccee41d17ce381af3620c9bf
Merge: d138100 5b421cf
Author: Matthew Pierpont <mpierpont@bannerengineering.com>
Date:   Fri Nov 7 08:29:35 2014 -0600

    Merge branch 'master' into ECO/121295_Q4X

commit d138100167aaea561bd172e70e9919e546e64371
Author: Matthew Pierpont <mpierpont@bannerengineering.com>
Date:   Tue Nov 4 08:17:38 2014 -0600

    ECO 121295 release
Squashed commit of the following:

commit 06133935d756b66b09493b79a594841b556af041
Author: Corey Hanson <chanson@bannerengineering.com>
Date:   Wed Oct 29 14:40:51 2014 -0500

    ECO 113173 p/n 164412 v1.03 release

commit 33f90333dffa7ae403494523e5041ab40f7f02db
Author: Corey Hanson <chanson@bannerengineering.com>
Date:   Wed Oct 29 14:21:25 2014 -0500

    p/n 167519 v1.00
Merge branch 'master' into EXP/EZ_ScreenLS

Conflicts:
	Library/Support/Q50 Protocol - 167519.lvlibp