Xavier's layer content.ftl changes (Squashed commit of the following:)

commit 62bb2709842431477b7cd781f7456381997e563f
Merge: b1ae02f 237a62f
Author: julian1 <julian.atkinson71@gmail.com>
Date:   Thu Jan 23 11:52:40 2014 +1100

    Merge remote-tracking branch 'remotes/origin/modify_aatams_biologging_shearwater_style' into master_content_changes

commit b1ae02fb848db1b7f6d8732f9f81d6116ac8b0b3
Merge: 2109233 40a357e
Author: julian1 <julian.atkinson71@gmail.com>
Date:   Thu Jan 23 11:52:14 2014 +1100

    Merge remote-tracking branch 'remotes/origin/add_content_ftl_to_abos_sofs_surfaceprop_rt_map' into master_content_changes

commit 2109233343cac6853add364e6aa29f22028c059f
Merge: 29de981 dc90fb6
Author: julian1 <julian.atkinson71@gmail.com>
Date:   Thu Jan 23 11:51:53 2014 +1100

    Merge remote-tracking branch 'remotes/origin/add_content_ftl_to_abos_sofs_surfaceprop_dm_map' into master_content_changes

commit 29de981d1786b5fe7054070e174987ce69af1996
Merge: 6163e51 05e02d4
Author: julian1 <julian.atkinson71@gmail.com>
Date:   Thu Jan 23 11:51:15 2014 +1100

    Merge remote-tracking branch 'remotes/origin/add_content_ftl_to_anmn_ts_timeseries_map' into master_content_changes

commit 6163e516caafec12081c765e64e41b8642d506bf
Merge: e7d713e 802892a
Author: julian1 <julian.atkinson71@gmail.com>
Date:   Thu Jan 23 11:50:44 2014 +1100

    Merge remote-tracking branch 'remotes/origin/add_content_ftl_to_anmn_nrs_rt_wave_timeseries_map' into master_content_changes

commit e7d713ea917cee0f9a9dbb64d299e7c4f85e1545
Merge: 4a5f27a 5b5eefb
Author: julian1 <julian.atkinson71@gmail.com>
Date:   Thu Jan 23 11:50:13 2014 +1100

    Merge remote-tracking branch 'remotes/origin/add_content_ftl_to_anmn_nrs_rt_bio_timeseries_map2' into master_content_changes

commit 4a5f27a27ad5aef741362fa38dd0c086dccfc9d4
Merge: adff3ed 3168fc4
Author: julian1 <julian.atkinson71@gmail.com>
Date:   Thu Jan 23 11:49:46 2014 +1100

    Merge remote-tracking branch 'remotes/origin/add_content_ftl_to_anmn_nrs_rt_meteo_timeseries_map2' into master_content_changes

commit adff3edb6fa4c35414a3baac3c5ef34973c8afd2
Merge: 8a68f1c 1d76436
Author: julian1 <julian.atkinson71@gmail.com>
Date:   Thu Jan 23 11:49:19 2014 +1100

    Merge remote-tracking branch 'remotes/origin/add_content_ftl_to_anmn_velocity_timeseries_map2' into master_content_changes

commit 8a68f1c899c021ca31a9d171a2c74f9fa8e60b93
Merge: 6194392 157cd70
Author: julian1 <julian.atkinson71@gmail.com>
Date:   Thu Jan 23 11:48:52 2014 +1100

    Merge remote-tracking branch 'remotes/origin/add_content.ftl_to_anmn_burst_avg_timeseries_map2' into master_content_changes

commit 61943925ea62f51e659cf16686e09f4b41d50e58
Merge: 9ee6e64 7921a10
Author: julian1 <julian.atkinson71@gmail.com>
Date:   Thu Jan 23 11:48:04 2014 +1100

    Merge remote-tracking branch 'remotes/origin/add_content_ftl_to_aatams_sattag_nrt_map' into master_content_changes

commit 9ee6e644b9b2a059add8d1ab5326c13323db721d
Merge: c232623 4550106
Author: julian1 <julian.atkinson71@gmail.com>
Date:   Thu Jan 23 11:47:09 2014 +1100

    Merge remote-tracking branch 'remotes/origin/add_content_ftl_to_soop_xbt_dm2' into master_content_changes

commit c232623853865115f89d75cd2c9dbdbe07618f46
Merge: 9e8bc11 93ead04
Author: julian1 <julian.atkinson71@gmail.com>
Date:   Thu Jan 23 11:46:38 2014 +1100

    Merge remote-tracking branch 'remotes/origin/add_content_ftl_to_aatams_biologging_shearwaters2' into master_content_changes

commit 9e8bc110b76edc687bccfd9284f3b7b7465e17c2
Merge: 1b21186 d34c453
Author: julian1 <julian.atkinson71@gmail.com>
Date:   Thu Jan 23 11:45:58 2014 +1100

    Merge remote-tracking branch 'remotes/origin/add_content_ftl_to_aatams_biologging_penguin2' into master_content_changes

commit 237a62f42f97d6919830ebc8752e7170276ab7a4
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Thu Jan 23 11:03:16 2014 +1100

    Added animal code feature to style for aatams_biologging_shearwater_map

commit 40a357ec81c2d60b3c173b6e086147da25c2fad2
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Thu Jan 23 10:46:19 2014 +1100

    Added content.ftl to abos_sofs_surfaceprop_rt_map

commit dc90fb6fd6438c60177066e52b12f3e9d403144c
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Thu Jan 23 10:43:45 2014 +1100

    Added content.ftl to abos_sofs_surfaceprop_dm_map

commit 05e02d42715dbdbac1e945c241d42e3113395089
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Thu Jan 23 10:39:06 2014 +1100

    Added content.ftl to anmn_ts_timeseries_map

commit 802892a141a7332fa212989ae6e631841dbf56af
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Thu Jan 23 10:31:18 2014 +1100

    Added content.ftl to anmn_nrs_rt_wave_timeseries_map

commit 5b5eefbfca6d7696d804d106bbed2c014cf89dbc
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Thu Jan 23 10:12:54 2014 +1100

    Added content.ftl to anmn_nrs_rt_bio_timeseries_map

commit 3168fc483fd2bcbbf70cbf32c3dd27cd1fb87354
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Thu Jan 23 10:09:43 2014 +1100

    Added content.ftl to anmn_nrs_rt_meteo_timeseries_map

commit 1d7643606a685a023034a590c01a9895ca5646d0
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Thu Jan 23 10:05:52 2014 +1100

    Added content.ftl to anmn_velocity_timeseries_map

commit 157cd7093bfb3895a56fe7d507465880a216cf96
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Thu Jan 23 10:00:18 2014 +1100

    Added content.ftl to anmn_burst_avg_timeseries_map

commit 7921a104ad37b7ab950c9f391d2f7617a5d12028
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Wed Jan 22 18:06:58 2014 +1100

    Added content.ftl to aatams_sattag_nrt_map

commit 455010610fbb4cdbd4fda4bb44e14fe9b04079dd
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Wed Jan 22 17:59:03 2014 +1100

    Modified content.ftl files by removing the title, the extra rows at the bottom, and an extra <BR>

commit 93ead041e4e8bcfcb532f2320205f167c263a0af
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Wed Jan 22 17:54:50 2014 +1100

    Modified content.ftl files by removing the title, the extra rows at the bottom, and an extra <BR>

commit d34c45304220dc57f2a69d16c06fbc80eaac6a79
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Wed Jan 22 17:48:15 2014 +1100

    Modified content.ftl file by removing the title, the extra rows at the bottom, and an extra <BR>.Also modified datastore.xml to expose primary keys

commit 1b2118671774e402234662501b10ebeac74e8251
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Wed Jan 22 17:43:17 2014 +1100

    Modified content.ftl files by removing the title, the extra rows at the bottom, and an extra <BR>

commit 589bedc0b9b8b82a0afb2473e9e691685ef3bd80
Merge: 5cc392a 1186736
Author: julian1 <jfca@utas.edu.au>
Date:   Tue Jan 21 22:00:43 2014 -0800

    Merge pull request #85 from aodn/add_content_ftl_to_soop_sst_2

    Modified content.ftl of soop_sst_dm_trajectory_map, remove <BR>s

commit 1186736dd4f8e86a5f5cb360c958628bfa88725e
Author: Xavier Hoenner <xavier.hoenner@utas.edu.au>
Date:   Wed Jan 22 08:12:42 2014 +1100

    Modified content.ftl of soop_sst_dm_trajectory_map, remove <BR>s
Merge branch 'master' of github.com:aodn/geoserver-config

Conflicts:
	workspaces/imos/JNDI_soop_sst/soop_sst_dm_trajectory_map/content.ftl