[changed] paths & cycle length of hotbackups
[changed] set player city maintenance discount to 1.0 (100%)
Merge branch 'Development' of github.com:kinshi/tarkin_scripts into Development
[Revamp]Acklay - Random spawns & Geo
[Fixed]Acklay templates
[Fixed]Geo Lab screenplay
[merge] SWGEmu unstable branch 11AUG14
[fix] missed template in merge
[merge] SWGEmu unstable 13AUG14
Merge branch 'Development' of github.com:kinshi/tarkin_scripts into Development
[removed] unused trainer types from various cities

[removed] crackdown troops from various cities
Merge branch 'Development' of github.com:kinshi/tarkin_scripts into Development
[removed] cpl more unneeded trainer types from coronet
Merge branch 'Development' of github.com:kinshi/tarkin_scripts into Development
[changed] Jedi management granted to server CSRs
Merge branch 'Development' of github.com:kinshi/tarkin_scripts into Development
[ADDED] Raavi Or'zeth (an artist), anniversary version

D
D
B
B
B
B
B
B
B
B
B
B
B
B
B
B
B

B
B
B
B
B
B
B
B
B
B
B
B
B
B
B
B
B
[Fixed] The rest of Raavi's files
[merge] swgemu unstable branch 17AUG14
Merge pull request #73 from stacy19201325/Development

[ADDED] Raavi Or'zeth (an artist), anniversary version
Merge branch 'Development' of github.com:wol0r/tarkin_scripts into wol0r-Development

Conflicts:
	scripts/screenplays/dungeon/geonosian_lab.lua