SWKROA-26 / SWKROA-31 Merge to Master

Squashed commit of the following:

commit 79a3ff01297ac137fe1a80595186fa03ca6595a5
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Sun Nov 9 22:07:32 2014 -0600

    Fixed issue with updateMessage appearing after canceling (because the cancel was causing  form submit since I didn't specify the "type").

commit 9ce3d1b0e5a1de9619bc42f7b4e73d4c87822769
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Sun Nov 9 21:41:39 2014 -0600

    Fixed issue with returning to the UI that the Membership was created.

commit 1fcc1048f63db3edcee2b7e9b7ad8e56f9461f61
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Sun Nov 9 20:09:03 2014 -0600

    Added a global error handler for Optimistic locking (409) and Unknown Exception (500).

commit 2e87efd6729d6ae8a998facea6a10c7a422480e4
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Wed Nov 5 22:51:13 2014 -0600

    Added the ability to set the Title back to (none).

commit 733627c48e20a021756fbfead7a7502f84835816
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Tue Nov 4 20:01:38 2014 -0600

    Tested adding a membership.
    However, it doesn't show in the listing upon return.

commit 865e85954049f7c63a6fbac57cbd927f9f39d730
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Sun Nov 2 17:53:37 2014 -0600

    Added checks to ensure the only 1 address, 1 phone number, and 1 email address can be marked as primary for each member.

commit d72470a6a1bd4dc4e4fd4346c1dc0db38802271d
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Thu Oct 30 21:48:55 2014 -0500

    Added primary_ind to domain and service layers.
    Final phase of testing new Membership page.

commit 3052a27f28e7d24b5e48f2e4d738234c6e1933c0
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Sun Oct 26 20:06:50 2014 -0500

    Consolidated some thymeleaf html fragments.
    Added primary check boxes to Address, Phone, and Email.

commit 513d9b9e5e7456ad80f81b2fa9377bbba69bc454
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Sun Oct 26 07:53:15 2014 -0500

    Added separate messages for no search performed vs no results found.
    Fixed a few display issues around the join date.

commit 735c880ce99d23759d568fd5bb8d4d56ad786546
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Sun Oct 26 07:38:06 2014 -0500

    Refactored to still use Thymeleaf for i18n while using AngularJS to switch views by showing/hiding portions of the page.

commit 0251439aaa5fce1ef1c8511bba5b0bf3c5a0b04c
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Fri Oct 24 21:54:11 2014 -0500

    Added Spouse into single page version of Membership.

commit e31381ebde518ddbe4e11841495d68e97d03e37b
Merge: 266848f e92f1b8
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Thu Oct 23 21:14:53 2014 -0500

    Merge branch 'SWKROA-26_Specify-Primary-Address-Email' of https://github.com/cagst/swkroa into SWKROA-26_Specify-Primary-Address-Email

    Conflicts:
    	swkroa-domain/src/main/java/com/cagst/swkroa/member/Membership.java
    	swkroa-war/src/main/webapp/partials/membership/detail.html
    	swkroa-war/src/main/webapp/partials/membership/list.html
    	swkroa-war/src/main/webapp/partials/membership/main.html

commit 266848fa16f531f5f8d9516d8fa521b8c4d20409
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Thu Oct 23 06:29:11 2014 -0500

    Added 'local' and 'deploy' profiles.
    Added more support for Modify membership.

commit 4583161eae10d11d6b6c1a86c9323beb72130ce2
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Wed Oct 22 21:41:13 2014 -0500

    Checkpoint before master rebase

commit ba48ab94642fe37a50115f8492afa5a09830be13
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Tue Oct 14 06:14:48 2014 -0500

    Added support for add, edit, delete comments into new SPA view of Memberships.

commit fcb2d92fb3b767464b6ca10527d4dc8e4a75367b
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Mon Oct 13 22:03:15 2014 -0500

    Removed MembershipModel to standardize around the Membership object.
    Added a getPrimaryMembership helper method.
    Implemented the Comments and Transactions in the detail section.

commit 5f55ac7ee8b126fed9e21558491f8d678dbd738c
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Mon Oct 13 20:31:58 2014 -0500

    Fixed issue with utilizing 'query' variabled.  Changed to pass it in.

commit 76652ecf3d84289a35e8885c9fcd5a1a83942eef
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Sun Oct 12 10:18:06 2014 -0500

    Started re-implemented Memberships list, add, edit pages into more of a single page app.

commit e92f1b8e144c187f4e8b73624fd214bb5b517d8b
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Tue Oct 14 06:14:48 2014 -0500

    Added support for add, edit, delete comments into new SPA view of Memberships.

commit 8dae0b14ce6c82fdfbae8dd02b793d9b38a32609
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Mon Oct 13 22:03:15 2014 -0500

    Removed MembershipModel to standardize around the Membership object.
    Added a getPrimaryMembership helper method.
    Implemented the Comments and Transactions in the detail section.

commit 5e5bdc912d03618437447c4495d1d06a2d164300
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Mon Oct 13 20:31:58 2014 -0500

    Fixed issue with utilizing 'query' variabled.  Changed to pass it in.

commit f75e4d385eb30c48c180883f4bc7ed010becf5cb
Author: Craig Gaskill <cgaskill23824@att.net>
Date:   Sun Oct 12 10:18:06 2014 -0500

    Started re-implemented Memberships list, add, edit pages into more of a single page app.