Fixed exploit in CR_ACIDDEMONSTRATION
Fixed issue 8087
http://hercules.ws/board/tracker/issue-8087-excrescent-blank-line-in-pcc/
Fixed Bug 8107

feintbomb issue which could cause endless hiding.
Special Thanks to kyeme.
http://hercules.ws/board/tracker/issue-8107-feint-bomb-super-bug/

Signed-off-by: shennetsind <ind@henn.et>
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Fixed Bug 8103

Issue with dragon mounted icon not showing up after relog.
http://hercules.ws/board/tracker/issue-8103-riding-dragon-mount-icon-missing/

Signed-off-by: shennetsind <ind@henn.et>
Follow up 4cc9d5f91cf6276e28cc02bb75fc4158d28d553b

Fixed the afk-kick timer, special thanks to AnnieRuru.

Signed-off-by: shennetsind <ind@henn.et>
Fixed Bug 8109

elemental's action could cause itself to be destroyed (e.g. due to target's reflect) and would thus cause sd->ed to be null, and would cause a crash when trying to access sd->ed->db, so moving the duration check to prior to elemental's action trigger.
Special Thanks to OmegaRed.
http://hercules.ws/board/tracker/issue-8109-mapserver-crash-skill-so-el-action

Signed-off-by: shennetsind <ind@henn.et>
Fixed a skill_castend_nodamage_id warning for SO_ELEMENTAL_SHIELD

skill_castend_nodamage_id: Unknown skill used:5008

Signed-off-by: shennetsind <ind@henn.et>
Fix Bug 8106
http://hercules.ws/board/tracker/issue-8106-crescent-elbow-knockback-range/
Increase reflect damage make by crescent elbow

Fix Bug 8099
http://hercules.ws/board/tracker/issue-8099-renewal-acid-bomb-damage/

Cart Revolution will now always knock targets to the West - rAthena:1f26499994af9b64aa96d5ed46f6e7cdefdb025b

Fix a bug with Backslide that let you continue to move even if you hit a wall on some case. 

Thanks to Ind
HPM Hooks Update

Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
revert https://github.com/HerculesWS/Hercules/commit/d554d61417a6
*show the matk in the status window.
HPM Hooks Update

Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
Added new return values to make_new_char_sql
Added char_id to charlog
Corrected RE check in skill_magic_reflect (see commit c9310f3)
Update rAthena-main-upgrade.sql

Following up latest commit that alters the database (4b1cc23085b858364a332bdf03d634656778b1e6).

Logs converter isn't needing an upgrade yet.
Merge remote-tracking branch 'upstream/master'